add client module
Merge remote-tracking branch 'origin/master'

Conflicts:
	api/api.iml
	build.gradle
	gradle-study.git.iml
	settings.gradle