illustration stuff
Merge branch 'dev' of github.com:legworkstudio/Legwork2012 into dev

Conflicts:
	app/assets/javascripts/desktop/data/world/what-we-learned-2012.js.erb