Fixed intergration issues and image issues
Merge branch 'master' of https://github.com/CrossroadsAndroid/AndroidApp