Port in Android 2.1 + Correct Title UI
Merge branch 'master' of https://github.com/Floki/ProjetAndroidM2DL2014