Fix paths
Merge branch 'dev'

* dev:
  Fix paths
Merge branch 'master' into gh-pages

Conflicts:
	index.html