Fixed views overlap in login screen
Merge branch 'develop' of github.com:Amab/SWADroid into develop