couple of quick bugfixes
Merge branch 'master' into version_2_9
fix for chinese domain
new resizable home page and css for top bar and right bar
started using intro.js with new tutorials,
removed group affinity

Merge branch 'master' into version_3_0

Conflicts:
	app/controllers/application_controller.rb
	app/models/proposal.rb