Fix merge bugs in login page
Merge branch 'master' of http://github.com/jgonzalez5/CommuniTrade