Updates to support new eMagazine iType
Fix loading overdrive formats
Require sip2 code appropriately
Merge branch 'M2014.05.1' into M2014.06.0

Conflicts:
	sites/default/translation_maps/econtent_itype_format_category_map.properties