work on admin - in progress
changes to layout design and tables in admin
solved conflicts
finished admin redesign
finished admin redesign
changed opacity back to .5 and fixed conflicts
creates csv files for db dump
import from csv to db for items
created rake tasks for images / sites
Merge pull request #5 from EclairBristol/import

Merge import in Master
Merge branch 'master' into bootstrap3

Conflicts:
	db/eclair.sqlite3