home page and login page UI improve
fix merge conflict
Merge branch 'master' of github.com:SlideMark/slidemark