Merge branch 'master' of https://github.com/wangkilin/poptrip

Conflicts:
	Public/vote/app/Lib/Model/VoteModel.class.php
	Public/vote/app/Tpl/Index/Index.html
Merge branch 'master' of https://github.com/wangkilin/poptrip