Make all indents 2 spaces
Merge branch 'master' into ria

Conflicts:
	src/main/g8/src/jade/index.jade
	src/main/g8/src/less/main.less