merged mnch to develop
fixed resource availability mnh
Merge commit 'bbddfb63ad1dd89d7f9103068d89e4eb9b343d3a' into mnch

Conflicts:
	application/modules/analytics/controllers/analytics.php
	application/modules/analytics/models/analytics_model.php