elean up

Conflicts:
	src/main/webapp/css/stylesheet.css