2014/1/27
Merge remote-tracking branch 'origin/master'

Conflicts:
	Mini/Lib/Action/IndexNewAction.class.php
	Mini/Lib/Model/ProductSynModel.class.php
2014/1/27