Changes to the global role factory definitions.  Temporarily commented out workouts content from sidebar until NPE gets fixed.
Merge branch 'master' into exercise-wip