Updated changelog
Merge branch 'develop'

Conflicts:
	CHANGELOG.md
Merge branch 'develop'
Force update cocoapods for travis-ci builds