Change Dashboard
Merge branch 'master' of github.com:coderdiaz/webapnote

Conflicts:
	application/views/dashboard.php