temporrary
Revert "changed the login controller"

This reverts commit a03dfe641be70a06f0e96112ab0b70c31f202d25.
Revert "Revert "changed the login controller""

This reverts commit a5eba75122a52242824334f2736d60b2c51fcc0d.
Revert "Revert "Revert "changed the login controller"""

This reverts commit 9f54eda246f5396019b4d4c5c62026f7400ee0bb.
Revert "temporrary"

This reverts commit 616e1098f329b54f84958605474e319438a31bee.
Merge remote-tracking branch 'origin/master'