added check on pending
Merge branch 'master' of https://github.com/juleski/cbcorp

Conflicts:
	app/View/Dashboards/index.ctp