merge master
Merge branch 'master' into style
search bar
user logout view
side bar edit
begin task bar