Converting tabs for 2-spaces.
Merge branch 'serpentem/dev'

Conflicts:
	cli/src/commands/add.coffee
	cli/src/commands/add_project.coffee
	cli/src/generators/controller.coffee
	cli/src/generators/model.coffee
add socket.io 0.9.13
Merge branch 'dev' of github.com:hems/theoricus into dev

Conflicts:
	cli/src/commands/compiler.coffee
	cli/src/commands/server.coffee