Removal of any old NCRIS logos and text references
Merge pull request #637 from aodn/further_logo_text_changes

Removal of any old NCRIS logos and text references
Revert accidental addition of newline to minified moment js source.
CQL_FILTER must be url encoded, otherwise spaces gets munched up
removed redundant new lines
test to verify CQL string is encoded
Merge pull request #641 from aodn/revert_moment_js_newline

Revert accidental addition of newline to minified moment js source.
Merge pull request #642 from aodn/issue_619

Issue 619
upgraded moment.js to 2.4.0
Merge pull request #645 from aodn/upgrade_moment

upgraded moment.js to 2.4.0
Merge branch 'master' into wms_wfs_time_range_filter
c/test/javascript/portal/prototypes/OpenLayersSpec.js

Conflicts:
	src/test/javascript/portal/prototypes/OpenLayersSpec.js