modify
upload & select
merge
Merge branch 'monsoul' of https://github.com/ludwiksh/Etales-result-viewer into monsoul

Conflicts:
	app/index.html
edit
chart
edit chart
fix file upload
fix file upload