a
Merge branch 'master' of github.com:akvara/zf2

Conflicts:
	composer.phar
nothin
Merge branch 'master' of github.com:akvara/zf2
Merge branch 'master' of github.com:akvara/zf2