documentation about configuration artifacts in deployment artifacts
documentation about configuration artifacts loading during runtime
clean up
Merge origin/master