7/12/13
7/12/13 #2
7/12/13 #3
Merge branch 'master' of https://github.com/BurnBlader/andchat into BurnBlader-master

Conflicts:
	src/com/coderdojo/andchat/AndchatDate.java
	src/com/coderdojo/andchat/AndchatMessage.java