cambio
Merge remote-tracking branch 'origin/master'

Conflicts:
	cc/views/layout.ejs
Merge branch 'master' of https://github.com/eumati/res-node