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

Conflicts:
	app/views/apartments/index.xls.erb