merge
Merge branch 'master' of github.com:CELAR/celar-server

Conflicts:
	celar-server-daemon/src/main/java/gr/ntua/cslab/celar/server/daemon/rest/Application.java
Merge branch 'master' of github.com:CELAR/celar-server

Conflicts:
	celar-server-daemon/src/main/java/gr/ntua/cslab/celar/server/daemon/rest/Application.java
merge