Strip data test cases completed
Merge remote-tracking branch 'origin/master'

Conflicts:
	code/test/tests_social_platform.py