First design improvements
First design improvements
Updated design
Merge branch 'design' of https://github.com/utwente-di/di04.git into
design

Conflicts:
	kunstmenu/src/main/webapp/css/site.css
Fixed fatal nuclear error
Merge branch 'design' of https://github.com/utwente-di/di04 into design

Conflicts:
	kunstmenu/src/main/webapp/css/site.css
A new hope
Modal login on index.jsp

NOT WORKING: Refresh page after login
Fixed previous error
Beautified sidebar and made a static first carousel slide, which acts as
a welcome to new users so that they find their way around the kunstmenu
site, and will book an activity, so we got that going for us, which is
nice.
JAXrs
Merge branch 'design'

Conflicts:
	kunstmenu/.settings/org.eclipse.wst.common.project.facet.core.xml
	kunstmenu/src/main/webapp/ViewActivity.jsp
	kunstmenu/src/main/webapp/WEB-INF/web.xml
	kunstmenu/src/main/webapp/index.jsp