fixt bugs
Merge branch 'master' of github.com:zhanglun/TeamCoop

Conflicts:
	teamcoop/views/api.py
porject issues donw! WTF