merge conflict
Merge branch 'gh-pages' of https://github.com/RainerAtSpirit/Durandal-Fiddle into gh-pages