Data update
Merge branch 'master' of https://github.com/qianji/data-analysis-shiny

Conflicts:
	data/group-report.RData