remove local config files from git
Merge pull request #155 from pmattmann/zf2.web.group

Ajax API Collection Rendering
Merge remote-tracking branch 'ecamp/devel' into feature/campinfo
renaming
...
Merge pull request #156 from usu/feature/minors

Feature/minors
Merge branch 'devel' of https://github.com/ecamp/ecamp3 into zf2.api.error

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