commit before pull
Merge branch 'master' of https://github.com/nyi/happen-android
 commit b4 merge
 merge conflicts handled maybe