created building controller and views with edit and new forms in partials
 tried ot add database
---
Merge branch 'master' of https://github.com/PropMan/PropMan
--
Merge branch 'buildings'
Building views in progress
Merge branch 'master' of https://github.com/PropMan/PropMan

Conflicts:
	app/models/company.rb