This is my commitment

Commitment for M3
committance
fbfb
svssv
Merge branch 'master' of https://github.com/sunheng/TeamJavatar

Conflicts:
	gen/com/example/teamjavatar/R.java
	res/values/strings.xml
sc