added working stats and jQuery graphs
fixed a conflict.
Merge branch 'master' into models