almost finish with resvn schedule
Merge remote-tracking branch 'origin/master' into ResvProc-Client

# By Patrich Paolo Datu
# Via Patrich Paolo Datu
* origin/master:
  MAPS!
  merge?
  Maps with markers(campus)
  Added Resources CRUD
  Merged with CRUD-venue
  updated :)
  Added checkbox to create form

Conflicts:
	FRS.clpprj
	application/config/autoload.php
	application/config/routes.php
	application/models/campus_model.php
	application/models/equipment_model.php
	application/models/resource_model.php
	application/views/building/create.php
	application/views/building/edit.php
	application/views/consumable/create.php
	application/views/consumable/edit.php
	application/views/equipment/create.php
	application/views/equipment/edit.php
	application/views/main/home.php
	application/views/staffing/create.php
	application/views/staffing/edit.php
	application/views/templates/header.php
add resources to reservation -not finished
merge master to ResvProc-Client branch
fix merge master->ResvProc-Client
resv form CR w/o notif, complex payment

+delete cons, equi, staff, registeredu
+edit and add functions to resource_model
+add resource to resv form
+use username instead of mail in AP
+reserve on behalf
+added table reservation, resv_res_join, frs gygy struct,data
+updated frs gygy, venue
approve, reject, revoke, acknowledge
delete DS_Store
Merge ResvProc-Client to FHG branch
Merge remote-tracking branch 'origin/FHG'