conflict merge
Merge branch 'development' of https://github.com/sunheng/TeamJavatar.git
into development

Conflicts:
	gen/com/example/teamjavatar/R.java