mod: application_controller
Only run Travis builds on master and staged branch
Improved readability
Thanks team turing. Addding in Isil's indexes
Merge branch 'master' of https://github.com/professor/whiteboard
Merge branch 'master' into staged

Conflicts:
	db/schema.rb
Merge branch 'staged' of github.com:Gonghan/whiteboard into staged

Conflicts:
	app/controllers/application_controller.rb