Merge branch 'navbar'
authorYrjan A. F. Fraschetti <yrjanaff@1x-193-157-214-191.uio.no>
Thu, 3 Dec 2015 18:00:16 +0000 (19:00 +0100)
committerYrjan A. F. Fraschetti <yrjanaff@1x-193-157-214-191.uio.no>
Thu, 3 Dec 2015 18:00:16 +0000 (19:00 +0100)
Added new features for filtering


Trivial merge