added logged in and current user helper methods
update
Merge branch 'login4' into develop