Charles Hacskaylo 69f4b4975e Merge branch 'open-master' into open1170b ...

Conflicts:
	platform/commonUI/general/res/sass/plots.scss
	platform/commonUI/inspect/src/InfoConstants.js
	platform/features/imagery/src/policies/ImageryViewPolicy.js
	platform/features/static-markup/res/markup.html

2015-06-18 09:55:26 -07:00

..

res

[Frontend] Added local zoom/reset controls

2015-06-08 15:24:17 -07:00