Fixed classes to reflect code changes
Merge branch 'master' of https://github.com/europeana/corelib

Conflicts:
	corelib-db/src/main/java/eu/europeana/corelib/db/service/impl/UserServiceImpl.java
	corelib-db/src/test/java/eu/europeana/corelib/solr/service/mock/SearchServiceMock.java