2014-06-18
Merge branch 'master' of github.com:chenqf/front-end