TestCommit
Test
trending
trending
changes
test
Merge branch 'master' into 17/5

Conflicts:
	AntMapp5.xcodeproj/project.xcworkspace/xcshareddata/AntMapp5.xccheckout
	AntMapp5/Base.lproj/Main.storyboard
	AntMapp5/TrendingViewController.h
	AntMapp5/TrendingViewController.m