commit
Merge branch 'master' of https://github.com/bluecats/bluecats-scratchingpost-android