ACTION PLAN
Before I start demo kit run-through
Merge origin/master

Conflicts:
	application/controllers/cases.php