Merge remote-tracking branch 'upstream/master' into fixhead

Conflicts:
	app/models/skill.rb
	lib/environment.rb
Merge branch 'fixhead'

Conflicts:
	app/models/skill.rb
	lib/environment.rb