cleaned a little
Merge branch 'development' of https://github.com/sunheng/TeamJavatar.git into development