refs #590
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev

Conflicts:
	app/controllers/organizations_controller.rb
	app/views/organization_technologies/_abacus.html.erb

	Adding xlsx compatibility