calc app
Merge branch 'master' of https://github.com/Proalab/cba_appraiser_soft

Conflicts:
	app/controllers/application_controller.rb