First commit for feature
Commit 2
High charts upgrade
Merge branch 'feature/dashboard' into develop

Conflicts:
	application/views/national/national_home_v.php