merge
Merge branch 'master' of https://github.com/stiftungswo/DimeTimetrackerBundle

Conflicts:
	Form/Type/RateFormType.php