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
Merge branch 'master' into webfont-0.3.x

Conflicts:
	_site/_includes/base-styles/icons/skycons.html
	_site/changes.html
	_site/dist/fonts/skycons.css
	_site/dist/fonts/skycons.eot
	_site/dist/fonts/skycons.ttf
	_site/dist/scripts/demo.js
	_site/dist/scripts/toolkit.js
	_site/dist/scripts/toolkit.min.js
	_site/grunt/webfont.js
	_site/index.html
	_site/src/fonts/template/skycon-template.css
	_site/src/js/demo/skycons.js
	_site/test-crossbrowser.html
	_site/test-without-coverage.html
	_site/test.html
	app/_includes/base-styles/icons/skycons.html
	app/src/fonts/template/skycon-template.css
	app/src/js/demo/skycons.js
	dist/fonts/skycons.css
	dist/fonts/skycons.eot
	dist/fonts/skycons.ttf
	dist/scripts/demo.js
	dist/scripts/toolkit.js
	dist/scripts/toolkit.min.js
	package.json
Merge branch 'master' of https://github.com/skyglobal/web-toolkit into rc-2

Conflicts:
	_config.yml
	_site/changes.html
	_site/dist/scripts/toolkit.js
	_site/dist/scripts/toolkit.min.js
	_site/index.html
	dist/scripts/toolkit.js
	dist/scripts/toolkit.min.js
	dist/stylesheets/demo.css
	dist/stylesheets/toolkit.css
	package.json
skycons.js in dist
Merge branch 'master' into webfont-0.3.x

Conflicts:
	_site/_includes/base-styles/icons/skycons.html
	_site/dist/fonts/skycons.css
	_site/dist/fonts/skycons.eot
	_site/dist/fonts/skycons.ttf
	_site/dist/scripts/demo.js
	_site/dist/scripts/toolkit.js
	_site/dist/scripts/toolkit.min.js
	_site/index.html
	_site/src/fonts/template/skycon-template.css
	_site/src/js/demo.js
	_site/src/js/toolkit.js
	_site/test-crossbrowser.html
	_site/test-without-coverage.html
	_site/test.html
	app/src/fonts/template/skycon-template.css
	app/src/js/demo.js
	app/src/js/demo/skycons.js
	generated-skycons/skycons.css
	generated-skycons/skycons.eot
	generated-skycons/skycons.ttf
attempt merge after massive restructure
use node engine to build
fix highlight js code + add forEach polyfill
ie7 working
reduce test coverage for polyfill.js
reduce test coverage for polyfill.js