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

Conflicts:
breeze/bin/AndroidManifest.xml
breeze/bin/breeze.apk
breeze/bin/classes.dex
breeze/bin/classes/com/crunchytech/breeze/MessagesFragment.class
breeze/bin/resources.ap_