partial
Merge branch 'flask-report-33' of https://github.com/PuZheng/flask-report into flask-report-33

Conflicts:
	flask_report/data_set.py
	flask_report/report.py