Update zend framework to 1.12.1
Merge branch 'master' of github.com:spekkionu/zfapp

Conflicts:
	scripts/tasks/phpcs/Spekkionu