changes
Merge branch 'develop' of https://github.com/RufusMbugua/mnh into develop

Conflicts:
	application/config/database.php
	application/controllers/c_pdf.php
	application/core/MY_Controller.php
	application/core/MY_Model.php
Changes
just some changes
Made Home Page and Firepad
pulling from the database
my model change
Added Email Functionality w/ INK
Adding User Management Functionality
Merge branch 'feature/MCH_Form_Posting' of https://github.com/cheriuyot/mnh into develop

Conflicts:
	application/controllers/c_load.php
	application/core/MY_Controller.php
	application/models/m_hcw_survey.php
Add Sections and Comments to MCH Online
Merge branch 'develop' of https://github.com/johnotaalo/mnh into develop

Conflicts:
	application/core/MY_Controller.php
Added Treatment Classifications Table
Changed MCH Treatment Query
Changed the 'mal' to 'fev' in sorting the treatments
Added text boxes to the 'Others' for malaria and pneumonia
Merge branch 'develop' of https://github.com/johnotaalo/mnh into feature/Admin_Management

Conflicts:
	application/config/database.php
	application/controllers/c_load.php
	application/controllers/c_pdf.php
	application/core/MY_Controller.php
Merge branch 'feature/Admin_Management' into develop

Conflicts:
	application/controllers/c_load.php
	application/core/MY_Controller.php
Fixed Conflicting Methods in MCH after Merge with J.O
Updating MCH and IMCI to include Case Management