changes
merged with mareka
Merge branch 'develop' of https://github.com/cheriuyot/mnh into develop

# Via cheriuyot
* 'develop' of https://github.com/cheriuyot/mnh:

Conflicts:
	application/models/m_analytics.php
	js/analytics.js