Interceptor configuration...
Merge branch 'master' of https://github.com/WinToosa/mobilelogger.git

Conflicts:
	MobileLoggerServer/src/main/webapp/WEB-INF/spring-context.xml