fd
daily commit
Merge branch 'master' of https://github.com/spilberg/eventdesigner

Conflicts:
	ed.php
	eventdesigner.sql
	inc/class.eventdesigner.php