sample apps preview
Fixes merge conflict.
Merge branch 'iKahvedzic-gh-pages' into gh-pages