user profile
Merge branch 'userredesign'
task show complete
Merge branch 'redesign_task_show'
small navbar changes
Merge Eric's navbar fix