5-2-2014 additionalchanges J
5-2-2014 additionalchanages J
Merge branch 'master' of github.com:whlly/demo
5-2-2014 additionalchanages J