Closed #12 #21 Agregado ng-cookies
Merge remote-tracking branch 'origin/TerminalsUI1.2' into TerminalsUI1.2

Conflicts:
	controller/login.js