files
Merge branch 'master' of https://github.com/mirow/zf2

Conflicts:
	module/Application/src/Application/Classes/AbstractEntity.php
	module/Application/src/Application/Model/EmcsModel.php