completed: first integration 2013.06.02
first intergration
Merge branch 'master' of github.com:zs634134578/undersea_game