Fix graph header issue, break up barchart code for school and topic view
Fix conflict in school controller
fixing merge conflict in school view.