#6
Merge branch 'master' of https://github.com/pascalgui/WakUp.git

Conflicts:
	src/main/java/fr/gpascal/wakup/WakUpApplication.java
	src/main/java/fr/gpascal/wakup/WakUpConfiguration.java