Delete config.yml
bring current
delete config.yml
Merge remote-tracking branch 'dev/master'

Conflicts:
	app/views/products/index.html.erb
add colorbox for images both in product view and upload view
add delete through ajax mechanisim for upload
add sort for photos (does not update db yet)
temp fix for product list display where it breaks the line if it's too
long
add position column in db for uploads
added etsy
update admin links, routes, gemfile (added jquery-ui-rails and etsy)
added mfg country and date to etsy description with link to site
restored some old images
Merge remote-tracking branch 'dev/master'

Conflicts:
	app/views/products/_product_list.html.erb
fixed etsy helper to upload images so it takes from revive not
revive-dev
Merge remote-tracking branch 'dev/master'
fixed etsy description where product id wasn't showing up
Merge remote-tracking branch 'dev/master'
setup model for oldsuit to import old records
update schema
Merge remote-tracking branch 'dev/master'
fixes issue #3 mobile render
remove products.js which was causing assets precompile to fail
fixes issue #11
fixed spelling errors
fixes issue #5
footer alignment - actually fixed in previous commit
fixes issue #8
changed sku validation to case insensitive
fixes issue #9
changed fields with type integer to display as text fields instead
fixes issue #12
method that creates size for suits makes sure that coat_size and
coat_length exist first
fixes issue #13
moved etsy_title to separate method and replaced "&" with "and" when
more than one is present to prevent etsy post from failing