Changes for disabled context functionality.
Merge pull request #40 from ahajirnis/CLUBUML-142

Changes for disabled context functionality.