fixed spacing
Merge remote-tracking branch 'origin'

Conflicts:
	generator-courage/app/index.js
some tests