Fixed NPE
update layout
update login method
v1.3.5
Merge branch 'dev'