Get front-end membership stuff working with latest 1.1 code.
Merge branch 'master' of github.com:pixelandtonic/ontherocks

Conflicts:
	craft/config/general.php