Merge remote-tracking branch 'origin/master'

Conflicts:
	Dev/web/app/config/database.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dev/web/app/config/database.php