buen login
Merge branch 'master' of github.com:remago12/ASI2-G1-E1-022014

Conflicts:
	asi/views/login.tpl.php