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