finish conference page
Merge branch 'master' of https://github.com/wwwangcai/medmeeting

Conflicts:
	common/urls.py
	manage/commonUser.py
	tpl/common_user_detail.html
Merge branch 'master' of https://github.com/wwwangcai/medmeeting
new_conference_info