Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Added calendar page
Completing Calendar setup
Added ActiveAdmin resources to manage schedules for now
Completed the calendar feature
Fix for 'to' text for No Class workout
Added month navigation to the calendar
Added fees display to Calendar