Test
Merge branch 'master' of https://github.com/walltergramajo/RezGuide

Conflicts:
	CMS/application/views/Building/building_options_menu.php