form map markers
Merge branch 'form_map_buttons' of https://github.com/RoProducts/MapStoreMobile into RoProducts-form_map_buttons

Conflicts:
	geocollect/android/core/res/values-it/strings.xml
	geocollect/android/core/res/values/strings.xml
Merge branch 'RoProducts-form_map_buttons'