User is now forced to be logged in

Username stored in [USERNAME]
Merge pull request #12 from cobookman/master

User is now forced to be logged in
Pushed files by accident
Merge pull request #13 from cobookman/master

Pushed files by accident
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