Added emailtemplate to initial_data fixture
Merge branch 'media-center'