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

Conflicts:
	Public/vote/Config/config.php
	Public/vote/app/Lib/Action/VoteAdminAction.class.php
	Public/vote/app/Lib/Model/OptionModel.class.php
	Public/vote/app/Lib/Model/VoteModel.class.php
Merge branch 'master' of https://github.com/wangkilin/poptrip