Updating settings
Merge branch 'master' of github.com:TackMobile/Android-Universal-Image-Loader