nigger
Merge branch 'dev' of https://github.com/wallish/zf2-init into dev

Conflicts:
	log