- updated code to handle morris and raphael
- updated js for charts
Merge branch 'master' of https://github.com/thenhkid/icsciences

Conflicts:
	src/main/webapp/dspResources/js/admin/main.js
- fix conflict