fixed
fixed groupIds
Merge branch 'develop'

Conflicts:
	README.md
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
added .travis.yml
Merge branch 'develop'

Conflicts:
	.travis.yml
Merge branch 'develop'
Merge branch 'master' of https://github.com/timmolter/XChange into develop