Added image field to types
Merge branch 'master' into image-to-types
Images can now be uploaded to company types
Bids now generate the offer correctly
Merge branch 'master' into network-page-under-construciton

Conflicts:
	app/views/networks/_types_view.html.erb
	app/views/networks/show.html.erb