start event Edit
Merge branch 'master' into eventEdit
fix conficts on merge EventDAO
added "edit event" functionality
Add role Manager and relation user - place
Merge branch 'eventEdit'