new fix layout params!
fix login form!
new fix login 2!
Merge branch 'origin/master'