Login Fixed

$sce issue fixed
login.tpl.html

Conflicts removed