put the module back in order for the pull request
Merge remote-tracking branch 'origin/master'

Conflicts:
	ios/LICENSE