A bit of JavaDoc; create default daemon.xml
Merge branch 'develop' into feature/daemon