login v1
Merge branch 'master' of https://github.com/aialenti/sistemidistribuiti

Conflicts:
	node_modules/application/controller.js