fixed some typos
small refactorings
(iOS) highlight timeline tab when timeline is changed
Merge branch 'DA-402' into unstable

* DA-402:
  (iOS) highlight timeline tab when timeline is changed
  small refactorings
  fixed some typos