added index, fixed base, added editUser view method
Merge branch 'master' of https://github.com/BeatMyGoal/beatmygoal

Conflicts:
	core/views.py