Bump
Merge branch 'master' of https://github.com/FHK-ADV/lwm into development
Better
Merge branch 'master' of https://github.com/FHK-ADV/lwm into development

Conflicts:
	app/controllers/EditsManagementController.scala
Merge branch 'master' of https://github.com/FHK-ADV/lwm into development