ITBJianYin/HelloWorld — pull request #2 by ITBJianYin (2014-10-16 03:38:12+00:00)
Title: Merge

merge from dev to master