Sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	iOS-libAugmental.xcodeproj/project.pbxproj
Sync