Frizz
Merge branch 'issue_events' into issue_events_1

Conflicts:
	protected/views/event/_view.php
	protected/views/event/crud/_form.php
	protected/views/event/single.php
Merge