He said so.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/annoymenot/logic/Message.java