added slugs
Merge branch 'master' into gh-pages

Conflicts:
	scripts/entry.js

merged
static