fixed exercise/diet plan display on dashboard

- Fixed exercise/diet plan display on dashboard
- Removed exercise plan display on registration process.
Merge remote-tracking branch 'origin/master'

Conflicts:
	dashboard/javascript/globs.js
	javascript/globs.js