Join button should work!
Merge branch 'master' of https://github.com/Sloth6/Beacon

Conflicts:
	app/client/js/index-controller.js