Bug fixes.
Merge branch 'master' of github.com:usf-it-rc/cwa_as

Conflicts:
	app/controllers/cwa_as_controller.rb
	app/models/cwa_as.rb