2014.1.15版本
Merge branch 'master' of https://github.com/monniya/smartFactory.git