Merge branch 'master' into CDAweb/head
Fixed problem with include path
Fixed prblem with CDAweb include path in standalone builder
Merge branch 'CDAweb/head'