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

Conflicts:
	src/main/resources/views/index.htm
	src/main/resources/views/js/AlarmConfig.js
	target/WakUp-0.0.1-SNAPSHOT.jar
	target/db/wakup.lck
	target/db/wakup.log
	target/db/wakup.properties
	target/db/wakup.script
	target/dependency-reduced-pom.xml
	target/maven-archiver/pom.properties