Signed-off-by: Aresxiao <xiaogeng91@foxmail.com>
Merge branch 'master' of https://github.com/Demonsu/NjuVolunteer

Conflicts:
	public/tpls/templates_c/6f00bc212eeb233b4d43be7198adf8c090176200.file.get_act_comment.html.php
	public/tpls/templates_c/832e5bdec5b5f59b956401796d175389aaa1c1eb.file.act_photo.html.php

Signed-off-by: Aresxiao <xiaogeng91@foxmail.com>