UI designed
Adjusted more UI
Merge remote-tracking branch 'origin/development'

Conflicts:
	bin/classes/com/example/teamjavatar/R$layout.class