Revert d179be0..6530e99

This rolls back to commit d179be00078abc5c56920cc3c4a7dbe6ca2bfe5f.
Merge branch 'master' of https://github.com/AndrewLane/hackathon2014lets-get-physical

Conflicts:
	Hackathon/Client/js/friendsctrl.js