fixed registration bugs
Merge branch 'develop'
fixed registration template bug
Merge branch 'develop'
fixed bug
Merge branch 'master' into develop

Conflicts:
	neerbee/registration/urls.py
minor template fix
fixed homepage bug
Bee User
fixed settings
everything with url tag
created user settings page
Merge branch 'develop'
settings template
Merge branch 'develop'
user model work
included mongoengine user
included user
user works
bee user works