Dashboard updates
Merge branch 'master' of github.com:rsnipes/ur-calendar-dev

Conflicts:
	application/config/database.php
Updates
Merge branch 'master' of github.com:rsnipes/ur-calendar-dev

Conflicts:
	application/models/dashboard_model.php
Merge branch 'master' of github.com:rsnipes/ur-calendar-dev

Conflicts:
	application/models/dashboard_model.php
Dashboard Model