Update login. Update home controller
Merge branch 'model' into dev