Restructured Assets, single fileupload, dynamic brands page
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/Glass.iml
	.idea/dataSources.xml
	.idea/runConfigurations/IRB_console.xml
	.idea/workspace.xml
	db/schema.rb
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/Glass.iml
	.idea/dataSources.xml
	.idea/runConfigurations/IRB_console.xml
	.idea/workspace.xml
	db/schema.rb