Update after Dojo on 2014-10-05
Merge remote-tracking branch 'origin/master'

Conflicts:
	workshop02/README.md