partial
Merge branch 'master' into flask-report-19
partial
partial
partial
Merge branch 'flask-report-19' into flask-report-33

Conflicts:
	flask_report/tools/create_data_set.py
partial
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
partial
fix #33
Merge pull request #35 from PuZheng/flask-report-33

Flask report 33