Remove merge conflict HEAD tag
Remove more merge code
Fixed login screen vertAlign
Fix merge conflict in app.js