Merge branch 'develop'
Update web-config.md
added data assembler and data adapter to solution.