add possibility to save search criterias
Merge branch 'master' of https://github.com/sallesma/GLO4003

Conflicts:
	src/main/java/database/files/UserModel.xml
	target/m2e-wtp/web-resources/META-INF/maven/com.glo4003/project/pom.properties