v0.2.7 Correction with the roombooking
Merge branch 'ParentPortal' of github.com:goandget/goPortal into ParentPortal

Conflicts:
	application/config/roombooking.php
	application/modules/roombooking/controllers/roombooking.php
	application/modules/roombooking/views/roombooking.php
	assets/roombooking/js/roombooking.js