tweaks
added part about data context
Merge branch 'devshop' into gh-pages

Conflicts:
	index.html