activities' help in progress
add_time to spots in progress
Merge branch 'master' of https://github.com/jcabotc/centro_de_negocios

Conflicts:
	app/helpers/admin/assignments_helper.rb
	app/models/room_related/spot.rb
add_time action to add time to spots