Resolve merge conflicts.
Tweaked header reference.
Added app icons.
Merge branch 'master' of https://github.com/MosheBerman/MBTimelineViewController

Conflicts:
	MBTimelineViewController/MBTimelineViewController/MBHorizontalTimelineFlowLayout.m