Building Menu Change

The Building option has now been changed to the new structure
Conflict Resolve

Conflicts:
	CMS/application/controllers/building.php