Site
Merge branch 'master' of https://github.com/vlad17/Palantir-Hackathon-2014-07

Conflicts:
	src/js/public/js/group.js