Possible fix for mypage error
Merge branch 'development' of github.com:tnds/reisebuero into development

Conflicts:
	app/views/events/_event.html.erb