Adjustment Join form
Merge remote-tracking branch 'origin/master'

Conflicts:
	skin/GoShopNow/css/style.css