Adding mo' content
Merge branch 'dev' of github.com:legworkstudio/Legwork2012 into dev

Conflicts:
	app/assets/javascripts/desktop/data/about-us.js.erb
	app/assets/javascripts/desktop/data/illustration.js.erb
	app/assets/javascripts/desktop/data/motion.js.erb
	app/assets/javascripts/desktop/data/open-source.js.erb