Misc.
Merge branch 'master' of https://github.com/olimart/queen_bee

Conflicts:
	app/controllers/api/v1/events_controller.rb