Merge branch 'style-updates' into dev
now if xml or vave file is invalid, it should get caught and mark the feed as Errored
Merge branch 'xml' into dev
Merge branch 'style-updates' into dev
Removed feed files that shouldn't be checked in
Merge branch 'dev' into style-updates

Conflicts:
	feeds/39/sample_feed_for_v3.0.zip
Merge deleted files, need commit