#WEB-2
#WEB-2
Merge branch 'master' of https://github.com/Medisana/vitadock-api.git

Conflicts:
	webclient/log.roo
	webclient/src/main/java/com/medisanaspace/jsf/TestRunnerBean.java
	webclient/src/main/webapp/pages/callback.xhtml
	webclient/src/main/webapp/pages/testrunner.xhtml