adding map screen
Merge branch 'develop' of https://github.com/MathieuCalba/mix-it-android into feature/editing-ui-styles

* 'develop' of https://github.com/MathieuCalba/mix-it-android:
  adding map screen