Added doctrine migrations
Merge branch 'master' of git://github.com/skaven/ZeroDoctrine

Conflicts:
	composer.json