Form saves schedule with content
Merge branch 'master' of https://github.com/gabe283/concerto_content_scheduling

Conflicts:
	Gemfile.lock
Merge branch 'master' of https://github.com/gabe283/concerto_content_scheduling
Merge branch 'master' of https://github.com/gabe283/concerto_content_scheduling
Merge branch 'master' of https://github.com/gabe283/concerto_content_scheduling
Merge branch 'master' of https://github.com/gabe283/concerto_content_scheduling
Check for null criteria
Remove old model
Merge pull request #15 from gabe283/criteriaCheck

Criteria check