->dashboard alert updates
Merge branch 'master' of https://github.com/pandahitam/basarnas

Conflicts:
	application/views/dashboard_view.php