Merchant Permission Database
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/assets/javascripts/welcomes.js.coffee
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/schema.rb
Show Warehouse
Merge remote-tracking branch 'origin/master'