Merge branch 'master' of github.com:rgirodon/NotificationEngineProbes into rgirodon-master

Conflicts:
	src/main/java/com/notificationengine/probes/Launcher.java
	src/main/java/com/notificationengine/probes/configuration/ConfigurationReader.java
	src/main/java/com/notificationengine/probes/domain/Channel.java
	src/main/java/com/notificationengine/probes/probe/DatabaseProbe.java
	src/main/java/com/notificationengine/probes/probe/FolderProbe.java
	src/main/java/org/notificationengine/probes/configuration/Configuration.java
	src/main/java/org/notificationengine/probes/domain/Channel.java