properties for OSGi bundle, should be using osgi karaf props
configurable, working from my pc...
Merge branch 'master' of github.com:nherbaut/vhg-adapted-video

Conflicts:
	adapted-video-osgi-bundle/pom.xml
	adapted-video-osgi-bundle/src/main/java/fr/labri/progess/comet/app/App.java
	adapted-video-osgi-bundle/src/main/java/fr/labri/progess/comet/bundle/Activator.java
	adapted-video-osgi-bundle/src/main/java/fr/labri/progess/comet/config/LabriConfig.java
	adapted-video-osgi-bundle/src/main/java/fr/labri/progess/comet/config/LabriConfigImpl.java
	adapted-video-osgi-bundle/src/main/java/fr/labri/progess/comet/cron/SchedulerUtils.java
	adapted-video-osgi-bundle/src/main/java/fr/labri/progess/comet/proxy/LabriDefaultHttpProxyServer.java