jade templating
Merge branch 'master' of github.com:mdarse/iot-automotive-plateform

Conflicts:
	app/routes/index.js