Added config files
Added code for some of the Router Calls
Modified API calls
Merge remote-tracking branch 'upstream/master'
Updated Org APIs
merging
Merging fun
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gruntfile.js
	api/index.php
	api/router.php
	app/config.js
	app/templates/checkinGuest/wrapper.hbs
	app/views/checkInGuest.js
	index.html
	templates.js
Organization API added
Modified router.php to be consistent with Org API calls
Merge pull request #15 from sj1991/master

Added API calls for Organizations and modified Route.php to include the correct Calls