Merge branch 'jade' into dev
chart
fixed conflicts
sample chart rendering
graph ajax set up
virtues are working
fixed conflicts