Merge branch 'master' of https://github.com/pubnative/pubnative-ios-demo into PNScroller

Conflicts:
	PubNativeLibrary.xcodeproj/project.pbxproj