20140823-3
Merge branch 'master' of https://github.com/tswangxj/TestApp