resolve conflicts
merge
fix app linechart bug
Merge pull request #435 from jialinsun/master

merge new code & repub