add s117
Merge branch 'master' of github.com:jtong/uestc-A515-pos

Conflicts:
	.gitmodules