Merge branch 'release/1.5.4' into develop
bumped dev branch version
changing database.config.php to be a dist file that will override if present, also replacing links to config file that cause upgrade troubles
Composer update
Merge branch 'release/1.5.5' into develop
WIP