chat layout
chat layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidTeamF/src/main/java/teamf/view/Chat.java
chat layout