Fix typo
Merge branch 'master' of
https://github.com/zf2-boiler-app/SampleApplication.git

Conflicts:
	config/application.config.php