adding GO
Merge branch 'dev' of github.com:legworkstudio/Legwork2012 into dev

Conflicts:
	app/assets/javascripts/desktop/data/work/alemeda.js.erb