fix some safe bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/upload.php
	res/js/post_edit.js