Made conf more flexible by introducing property file includes on different levels.
Merge branch 'master' of github.com:inca/circumflex