Context Navigation

Changes between Version 1 and Version 2 of Ticket #4420, comment 1

v1	v2
12	12
13	13	Edit: oh yeah and formation stuff. Completely broken now.
	14
	15	edit2: also to clarify what I want: the above patch should work as long as you don't use formations, so I'm looking for a review and some testing if possible, obviously not about the TODOs above though. I will post a separate patch to go on top of this one with those TODOs, to make reviewing possibly slightly easier.