Merge branch '5211-improved-top-navbar'
authorWard Vandewege <ward@curoverse.com>
Fri, 13 Mar 2015 15:24:46 +0000 (11:24 -0400)
committerWard Vandewege <ward@curoverse.com>
Fri, 13 Mar 2015 15:24:46 +0000 (11:24 -0400)
closes #5211


Trivial merge