Resolving conflicts

Conflicts:
	assets/js/dashboard/data_hiv.js
	assets/js/dashboard/data_mch.js