test
Merge branch 'master' of https://github.com/Qalexcitysocial/citysocializer-ios

Conflicts:
	.idea/workspace.xml
	citysocializer-automation.iml