Correct minor problems
Merge branch 'master' of git@github.com:EEXCESS/privacy-proxy.git
Moving to lucene 4.3.0
Merge branch 'master' of git@github.com:EEXCESS/privacy-proxy.git

Conflicts:
	src/main/resources/META-INF/spring/elastic.xml