Merge remote-tracking branch 'origin/master'

Conflicts:
	accounts/tests.py
	db.sqlite3
Update total score of an user
Merge remote-tracking branch 'origin/Working' into Working

Conflicts:
	db.sqlite3