Fixed a problem with the post build script creating unresolved conflicts in the demos
Merge branch 'master' of github.com:wet-boew/wet-boew-xsl