Fix conflicting errors in xml & adding
Merge branch 'master' of https://github.com/Stepedons-Tinkers/jardine-android