bolt/bolt — pull request #1579 by rarila (2014-08-23 14:26:27+00:00)
Title:  Refactoring of navigation (mainly the secondary one)

Sorry for the big commit, but as it is more a rewrite as refactoring…
Some minor issues still in there…