generated ActivitiesController
Merge remote-tracking branch 'origin/master'
work on activity_plans
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/ability.rb
	config/routes.rb