basic setup
Merge branch 'master' into setup_public_layout

Conflicts:
	app/views/layouts/admin.html.erb
Merge branch 'master' into setup_public_layout

Conflicts:
	app/views/layouts/admin.html.erb
	config/routes.rb
setup public layout + homepage + county page
deleted default error pages
removed the tmp files in the /public/upload/tmp folder and added it to .gitignore