Syncing part 2
Merge branch 'master' of github.com:Stepedons-Tinkers/jardine-android