Merge branch 'master' of https://github.com/skycom/web-toolkit into skycom-master
BF: got "using the toolkit" to use new dash-separated convention instead of camel-case
BF: stop jquery example loading actual jquery's by escaping the code
BF: changed reporting style to Spec from dot
BF: got "using the toolkit" to use new dash-separated convention instead of camel-case
BF: using-the-toolkit needs a special case in demo's showCode
BF: generated site and dist files for the previous commits
Merge remote-tracking branch 'origin/master' into skycom-master

Conflicts:
	Gruntfile.js
	_site/_includes/using-the-toolkit/getting-started.html
	_site/dist/scripts/changes.js
	_site/dist/scripts/demo.js
	_site/dist/scripts/testIFrame.js
	_site/dist/scripts/toolkit.js
	dist/scripts/changes.js
	dist/scripts/demo.js
	dist/scripts/testIFrame.js
	dist/scripts/toolkit.js
Merge branch 'skycom-master'

Conflicts:
	Gruntfile.js
	_site/_includes/using-the-toolkit/getting-started.html
	_site/dist/scripts/changes.js
	_site/dist/scripts/demo.js
	_site/dist/scripts/testIFrame.js
	_site/dist/scripts/toolkit.js
	dist/scripts/changes.js
	dist/scripts/demo.js
	dist/scripts/testIFrame.js
	dist/scripts/toolkit.js

and all have been dealt with (I thought I was on master, but I wasn't).