.
.
.
.
.
1. user parameter required for rest querys
Merge branch 'dev'

Conflicts:
	rest/target/maven-archiver/pom.properties
	rest/target/rest-0.1.0.jar
	rest/target/rest-0.1.0.jar.original