Added ascent to CRUD for activities
Merge branch 'master' into jh_add_ascent

Conflicts:
	spec/features/create_activities_spec.rb