merging for auth
fixed conflicts
merging with master
Added current grades widget