first blood
Merge branch 'master' of https://github.com/wwwangcai/medmeeting

Conflicts:
	medmeeting/__init__.pyc
	medmeeting/settings.pyc
finish base and models