Merge branch 'master' of https://github.com/jianghust/ofs
Merge branch 'master' of https://github.com/jianghust/ofs
Merge branch 'master' of https://github.com/jianghust/ofs
Merge branch 'master' of https://github.com/jianghust/ofs

Conflicts:
	commit/apply.php
	index.php
	lib/Base.php
	lib/Encode.php
	lib/View.php
	ofs.sql
	static/js/apply_submit.js
	static/js/teacher.js
	views/page/apply_suc.php
	views/widget/form.php
	views/widget/preview.php
by jiangzhibin
Merge branch 'master' of https://github.com/jianghust/ofs