adding username support
cleanup
Merge branch 'master' of https://github.com/twrobel/brainstorm-notifications-android