Renamed Channel to configuration

Fix some wording in logs
Support multiple paths in Folder probe
Merge remote-tracking branch 'upstream/master'

Conflicts:
	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/org/notificationengine/probes/Launcher.java
	src/main/java/org/notificationengine/probes/configuration/Configuration.java
	src/main/java/org/notificationengine/probes/domain/Channel.java
	src/main/java/org/notificationengine/probes/probe/FolderProbe.java
Merge remote-tracking branch 'upstream/master'
Merge pull request #6 from rgirodon/master

Try to align repositories