Added Travis CI and automatic deployment to Heroku
Generated event model and migration
Merge branch 'master' into dev

Conflicts:
	config/database.yml