Composer
Composer and server
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/index.php
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'