Adding registration changes and fixing some model errors
Merge branch 'master' of github.com:leeviana/gamify-lyfe

Conflicts:
	beers/urls.pyc
	beers/views.pyc
removing pyc files
removing more pyc files