Merge branch 'release/1.4.0'

# Conflicts:
#	protected/config/ver.conf.php

protected/config/ver.conf.php

@@ -1,5 +1,5 @@
 <?php
 
 // Version
-$config['ver'] = 'v1.2.1';
+$config['ver'] = 'v1.5.0';