Merge branch 'master' of https://github.com/jonsie/planner

Conflicts:
	config/routes.rb
	db/schema.rb
Merge branch 'master' of https://github.com/jonsie/planner