Merge pull request #39 from pminutillo/localdev

BISERVER-9039 - Changes based on UX recommendations. Please wait for PUC...
BISERVER-9039 - Added checks for undefined indicatorId param