Configure workspace
Merge remote-tracking branch 'origin/practices' into practices

Conflicts:
	Gemfile.lock
	practices/eclipse-productivity/index.md
Merge remote-tracking branch 'origin/practices' into practices
Merge remote-tracking branch 'origin/practices' into practices