Nästan klar editevent
fixed
Merge branch 'EditEventPopup'

Conflicts:
	php/api.php
	php/calendar_control.php
	php/calendar_view.php