Disabled activities with no equipment or locations
Merge branch 'gh-pages' into angular-ui-calendar