Merge branches 'master' and 'jundong' into jundong
Tried to add high charts into prettyPhoto plugin
Added missed lib files
Updated prettyPhoto to 3.1.5
Updated HighCharts libary
Added develop instruction into easy site.
Added chart view function in canyin
Merge pull request #7 from easydian/canyin_ui

Canyin ui