miscellanous
Merge branch 'cleanup' of github.com:Arbonaut/collect-android into cleanup