my hands are typing words (xkcd1296)
Merge branch 'develop' into feature-wegreen

Conflicts:
	app/models/exhibit.rb
implement wegreen widget plus some things that really shouldn't be merged into develop
set iframe to wegreen server
Merge branch 'develop' into feature-wegreen

Conflicts:
	Gemfile
changing iframe target
Merge branch 'develop' into feature-wegreen
change iframe script access
hide iframe overflow
final changes before first deploy
removing css fragment
Merge branch 'feature-wegreen' into develop