Merge branch 'refs/heads/3.6-dev' into 3.6/ipad-news

Conflicts:
	MIT Mobile.xcodeproj/project.pbxproj
	Modules/Campus Map/MITMapModelController.m
fixed performBackgroundUpdateAndWait block
Merge pull request #220 from MIT-Mobile/3.6/news-3.6-dev-merge

3.6/news 3.6 dev merge