DB Config
Merge branch 'master' of https://github.com/antonseitz/ZF2Tut

Conflicts:
	config/autoload/local.php