manage SC ferdig
Merge origin/master

Conflicts:
	pom.xml
	src/test/java/com/mycompany/bachelorprosjekt2014/servlets/SynergyCaseServletTest.java