Test
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/spinninggangstaz/stickyspeech/EditMessage.java
Test
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/spinninggangstaz/stickyspeech/MessageDB.java
Merge remote-tracking branch 'origin/master'