Merge pull request #471 from n8fr8/master

More, more, more!
simplify actionbar displayed icons/menus
fix bug with message type data overriding contact type
make offline avatars 50% alpha/faded
use full avatar/contact view in contacts picker
more tweaks to XMPP server redirect issue
update tests to android-19