adding list your join popup
Merge branch 'master' of https://github.com/pablotandil/joinajoin

Conflicts:
	webroot/css/all.css