Merge branch 'develop'
Make login page responsive
Improve layout
Make sign-up page responsive
Solve merge conflict
Merge branch 'develop'