Resolved GitHub and intenal QA team reported issues

Resolved GitHub issues: #315, #343.
Resolved Issues reported by internal QA team:
1) All the divs containing the error message had same id.
2)The next button to options tab in author mode remained disabled.
3)nls change for show/hide layer option.
Resolved GitHub Issue

Resolved #342
Merge remote-tracking branch 'upstream/development' into V8.5
Resolved GitHub Issues

Resolved #342, #343
Merge pull request #347 from CTDisasterManagement/V8.5

Resolved Github Issues