PM: demo branch of webfont 0.3.0
Merge branch 'master' into webfont-0.3.0

Conflicts:
	dist/fonts/skycons.css
	dist/fonts/skycons.eot
	dist/fonts/skycons.ttf
PM: update code with latest from master
Merge branch 'master' into webfont-0.3.0

Conflicts:
	_site/dist/fonts/skycons.css
	_site/dist/fonts/skycons.eot
	_site/dist/fonts/skycons.svg
	_site/dist/fonts/skycons.ttf
	dist/fonts/skycons.css
	dist/fonts/skycons.eot
	dist/fonts/skycons.svg
	dist/fonts/skycons.ttf
	package.json
PM: update from master + now using webfont-0.3.3
PM: tweak lightbox notes
Merge branch 'master' into webfont-0.3.x

Conflicts:
	Gruntfile.js
	_site/changes.html
	_site/dist/scripts/toolkit.js
	_site/index.html
	dist/scripts/toolkit.js
	package.json
latest version of webfont checked
remove demo.skycons as sorting is no longer needed
BF: generated on Linux with latest grunt-webfont
BM|LDB|DN: Add configurable video options for token and adverts
DK|JP: added default value for video token on carousel.
version bump
fixed missing responsive images js
add missing svgs
Merge remote-tracking branch 'origin/master'
move 'wiki_images' out of root
move 'screenshots' into test
minor restructure for screenshots + wiki_images
add how to install grunt cli