changes to the look and login
Merge branch 'development'