fixed views
fixed conflicts
fixed conflicts
Merge branch 'master' of https://github.com/BeatMyGoal/beatmygoal

Conflicts:
	core/views.py
fixed conflicts