Added highchart
Changed orm-mapping