Loading screen done
Merge branch 'dev' into login