Added new design on suppcelector and calculation field
Merge commit 'e2a768cb082295a86d0ed4ea17f60d270105c7fc'

Conflicts:
	src/main/webapp/WEB-INF/pages/draganddrop.jsp
	src/main/webapp/resources/styles/bootstrap.css