Making tests happy
Merge branch 'develop' into feature/cocoapods-2

Conflicts:
	Podfile
	Podfile.lock