Try out
Merge remote-tracking branch 'origin/master'

Conflicts:
	Controller/DefaultController.php