up
Merge branch 'gh-pages' of https://github.com/liyatang/HCharts into gh-pages

Conflicts:
	js/report_manager.js