added ds store
added images
Created labels and added charts
Fixed form error
Added colour themes
Added new chart icon to navbar
Merge branch 'fixing-design-flaws'

Conflicts:
	log/development.log
added solr
fixed spec to match new front-end
replaced helper from spec in order to use factory
updated spec to match new front-end
got rid of unnecessary helper method
updated specs to match new statuses
eliminated duplication by adding contexts instead of describe blocks
Fixed merge conflicts