Remove leftover ckeditor references
Coupon fixture now references CSV using relative path
Set MarkupSet fixtures to require user fixtures
Add institution fixture
Use reference to set institution
Corrected LoadInstitutionData description
Add term fixture
Added mechanism for switching between markup set fixtures
Merge pull request #258 from Harrison-M/fixtures

Repaired and added fixtures for working development environment
enrollFixture should come after CourseFixture
Added calendar event fixture
Fixture bugfixes

Resolves #263
Resolves #264
Resolves #265
Resolves #274
Progress on #275
Add missing files, fix ordering, namespaces
Merge branch 'master' of github.com:calliopeinitiative/marca

Conflicts:
	app/config/config.yml
Merge branch 'fixtures'

Conflicts:
	src/Marca/DocBundle/DataFixtures/ORM/AdditionalFixtures/UGAMarkupSet.php
	src/Marca/DocBundle/DataFixtures/ORM/Non_UGA_Fixtures/Non_UGA_Markupset.php.disabled