Fixed spaces and tabs
Merge branch 'development' of https://github.com/sunheng/TeamJavatar
into development

Conflicts:
	gen/com/example/teamjavatar/R.java
	src/com/example/teamjavatar/application/ReportDisplayActivity.java
spaces and tabs