side navigation put to work
removed merge conflicts with css
Merge remote-tracking branch 'upstream/master'
side navigation improved
removed conflicts on event description
Merge pull request #120 from rishy/master

side navigation edited