event recurrence

events will recur and have a creator, who would have the ability to edit it
Merge branch 'master' of github.com:Dvorax/apo-uaa

Conflicts:
	app/models/event.rb