separate toolbar in questions and map
Merge branch 'developer/andres' into develop
Merge branch 'develop'