commited
Merge branch 'master' of https://github.com/netf/Prime

Conflicts:
	models/group.pyc
Added UserModel update method