merge
updating class files
merge
Merge branch 'master' of https://github.com/sunheng/TeamJavatar.git