Merge remote-tracking branch 'origin/master' into TingYu'sBranch

Conflicts:
	TFT_project/settings.py
	TFT_project/urls.py
	TFT_project/views.py
	accounts/models.py
	accounts/views.py
	db.sqlite3
	filesManagement/models.py
	posts/models.py
	posts/views.py
	templates/discuss.html
	templates/file.html
	templates/main_base.html
	templates/pastpost.html
	templates/post_create.html
	templates/post_detail.html
	templates/teacher/teacher_info.html
	templates/teacher/teacher_info2.html
	templates/userena/profile_detail.html
	tft/urls.py