added remove button for meal_plans
start of activity planning
Merge branch 'master' of
git@github.com:RailsWeek2014/CookingWithRuby.git

Conflicts:
	app/models/user.rb

	create identities migration had the same version number as activity_plans