fixing merge
Merge branch 'master' of http://github.com/elkhouri/eco
fixing login page