bugfix in tab swapping code that left dangling view clients, removing superfluous function in og.analytics.data, some cleanup
Merge branch 'develop' into ui/dev