Merge pull request #14 from upenu/user-profile

UserProfile Model
my work
fixed bug where staff users cannot login to admin site
fixed bug where user is none but user.is_staff is called. fixed login bug in views.py
added login and register links to homepage, tells user account isnt approved when unapproved users try to login
minor changes
updates
Update forms.py
Update register_thanks.html
Merge pull request #15 from upenu/brianch3

My Stuff
Merge remote-tracking branch 'upstream/master' into event-model

Conflicts:
	website/urls.py
	website/views.py