Merge branches 'master' and 'develop'
Fixed delivery window bug
Fixed Good display
Fixed placeholder
Fixed good batch creation and editing
Updated user form
Added modal madness
Added marketplace for buyers
fixed name bug
Fixed goods tables
Fixed profile bug
Updated shit
Visual Adjustments to goods
Removed auto-generated tests
Updated a few bugs
Fixed security breach in signup
milestone A initial UI changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/registrations_controller.rb