Merge origin/master

Conflicts:
	source/src/main/java/org/cerberus/servlet/campaign/GetCampaign.java
	source/src/main/java/org/cerberus/servlet/testBattery/AddTestBatteryContent.java
	source/src/main/webapp/TestBatteryTestCaseResult.jsp
	source/src/main/webapp/TestCampaign.jsp
	source/src/main/webapp/WEB-INF/web.xml
#171 Test Campaign DatabaseVersioningService