Merge branch 'GUIPolymerTest' of https://github.com/marco9446/MAS into GUIPolymerTest

Conflicts:
	polymet_test/public/GUI-Graphs/js/editcopy.js
	polymet_test/public/finished/edit-page.html
Merge branch 'GUIPolymerTest' of https://github.com/marco9446/MAS into GUIPolymerTest

Conflicts:
	polymet_test/public/finished/edit-page.html