Doctrine Fixtures
Merge pull request #179 from usu/feature/material

Doctrine Fixtures
Merge branch 'devel' of https://github.com/ecamp/ecamp3 into feature/login_stash

Conflicts:
	composer.lock
	composer.phar