Merge pull request #1134 from mkalygin/master

Add supervisor's featured timelines.
Fix Featured/Favourite Timelines.