set version of grunt-webfont to 0.1.12 so template works
Added 7 icons to the web toolkit for use in the MyPackages project
PM: chevron - add up + down
Merge branch 'master' of git://github.com/Ladtech/web-toolkit into Ladtech-master

Conflicts:
	_includes/base-styles/skycons.html
	dist/fonts/skycons.css
	dist/fonts/skycons.eot
	dist/fonts/skycons.svg
	dist/fonts/skycons.ttf
	dist/stylesheets/toolkit.css
	dist/stylesheets/wiki.css
PM: skycons - add many more
PM: skycons - add many more
Resolves #49
PM: forms - cope with error messages better
Resolves #44
PM: forms - improve mobile view
Resolves #42
Merge remote-tracking branch 'upstream/master'
Merge branch 'merge-master-to-video'

Conflicts:
	_includes/base-styles/skycons.html
	_site/changes.html
	_site/dist/scripts/toolkit.js
	_site/dist/scripts/wiki.js
	_site/dist/stylesheets/toolkit.css
	_site/dist/stylesheets/wiki.css
	_site/index.html
	dist/fonts/skycons.css
	dist/fonts/skycons.eot
	dist/fonts/skycons.svg
	dist/fonts/skycons.ttf
	dist/scripts/toolkit.js
	dist/scripts/wiki.js
	dist/stylesheets/toolkit.css
	dist/stylesheets/wiki.css
	grunt/js/utils/skycons.js
Merge branch 'master' into merge-master-to-video

Conflicts:
	.gitignore
	_layouts/default.html
	dist/scripts/lib/jquery-1.10.2.js
	dist/scripts/lib/jquery-1.10.2.js.map
	dist/scripts/lib/jquery-2.0.3.js
	dist/scripts/lib/require.js
	dist/scripts/toolkit.js
	dist/scripts/toolkit.js.map
	dist/scripts/wiki.js
	dist/scripts/wiki.js.map
	dist/stylesheets/toolkit.css
	dist/stylesheets/wiki.css
	grunt/js/toolkit.js
branch to merged back to master
Merge branch 'newbranch'
Merged from global master into skycom fork
Merge branch 'master' into merge-master-to-video
ST: Merged global toolkit master into master then into the video merge branch