Added Edit Garbage and Housekeeping

Added a section to be able to choose which one you want to edit.
Merge branch 'master' of https://github.com/walltergramajo/RezGuide

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