added some xml compatability for android
Merge branch 'master' of https://github.com/fnc314/hair_etc_app
trying to fix push issue