Rename examples
Merge remote-tracking branch 'origin/master' into gh-pages
Firefox OS support and reshuffle
Resolved conflict