MIT-Mobile/MIT-Mobile-for-iPhone — pull request #220 by Smartcop (2014-10-06 21:04:16+00:00)
Title: 3.6/news 3.6 dev merge

Merging 3.6/dev into 3.6/ipad-news to resolve conflict