Merge branch 'devel' of https://github.com/ecamp/ecamp3 into zf2.web.group.membership

Conflicts:
	config/autoload/doctrine.local.php
	module/EcampApi/Module.php
	module/EcampApi/config/module.config.php