test initial
story 182: fixfsfasf
2014.7.1
Merge branch 'master' of https://github.com/smallfish0315/test