Merge branch 'dev' into style-updates
Adjusting styles and markup on approve feed result state - button and
link styles
Merge branch 'style-updates' into dev
pushing a possible fix to the issue with the DC feed not working with the rule processor.
Merge branch 'dev' of https://github.com/votinginfoproject/Metis into dev
updating the gitignore file
Fine tuning loader styles in active feeds table.

Adjust is-loading-small because it was causing padding issues
Merge branch 'dev' into style-updates
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
Adjusting disabled-row styles

Removed background color that was causing layout issues
Merge branch 'style-updates' into dev
Removed feed files that shouldn't be checked in
Adjusting fees upload box to be responsive

Hardcoded widths were breaking layout
Final QA fixes - including map height change

* Adding vertical media queries to adjust the height of the map to
prevent full screen cover up
Final QA fixes, pt 2

* Adjusting some colors for hovers and link underlines
* adding info icon to alert boxes with generated content
Merge branch 'dev' into style-updates

Conflicts:
	feeds/39/sample_feed_for_v3.0.zip
Merge deleted files, need commit
Merge branch 'style-updates' into dev