merge master
bug fix on delete
Merge branch 'master' into style
search bar
user logout view
side bar edit
begin task bar
added cookie key retrieval from projects