bugfix
Merge branch 'master' of https://github.com/ThomasBB/Joinster.git

Conflicts:
	Joinster/js/module.main.js