same icon on detail page implementation
Merge branch 'same_icon_detail_page' of https://github.com/RoProducts/MapStoreMobile into RoProducts-same_icon_detail_page

Conflicts:
	geocollect/android/core/src/it/geosolutions/geocollect/android/core/form/utils/FormBuilder.java
Display value of the field used to color the icon
JSON Lint on default template
Merge branch 'RoProducts-same_icon_detail_page'