Fixes exceptions of PerformanceLogRouteTest
Merge branch 'master' of github.com:steria/log-parser

Conflicts:
	cdms-profile/src/main/java/no/osl/cdms/profile/routes/PerformanceLogRoute.java
	cdms-profile/src/test/java/no/osl/cdms/profile/routes/PerformanceLogRouteTest.java