4h 40m mark
added actionbar tabs
Merge remote-tracking branch 'origin/master'