category
Merge pull request #1 from pawasthi/sushrut

user collection
user update
Merge branch 'master' of https://github.com/pawasthi/moocrest
Merge branch 'master' into sushrut
Merge branch 'master' of https://github.com/pawasthi/moocrest into sushrut

Conflicts:
	moo/classroom.pyc
	moo/data/storage.pyc
	moo/moo.py
	moo/moo.pyc