Merging
Merge branch 'master' of github.com:jorgeolivero/crowdtilt

Conflicts:
	app/views/orders/new.html.erb
Merge branch 'master' of github.com:jorgeolivero/crowdtilt