merge
Merge commit '8fed5d842e5fcae925746912c05f70bc20046e47' into develop

Conflicts:
	Podfile