sidebar work.
Merge branch 'master' into work/warren
merge with master.
Merge pull request #27 from okcomputer1982/work/warren

Work/warren