徙圖到統一的資料夾 丞宏
Merge branch 'master' of https://github.com/appytw/Appendectomy.git

Conflicts:
	application/helpers/proposal_helper.php