asdfasf
Merge branch 'master' of https://github.com/MisterSpicy/crunchytech

Conflicts:
	breeze/src/com/crunchytech/breeze/MessagesActivity.java