fixed chart bug
Merge branch 'change_20141111' into upgrade_to_rails32

* change_20141111:
  fixed chart bug