Merge latest form gene. Resolve conflicts
spacing
Merge pull request #3 from cheung31/master

Updates to FeedTickerView to facilitate source templates for twitter content