#Api call to list events and create new event
Merge branch 'master' of github.com:aserafin/inspottle

Conflicts:
	app/api/base.rb