Merge branch 'master' of github.com:cumbreras/funky-select
Adjusting order of JS dependencies
Merge branch 'master' of github.com:cumbreras/funky-select
Fixed cucumber tests
Actually testing the images are there..
Version bump to 1.0.4
Version bump 1.0.4
Wrapping backbone app in a div#supauploader
Version bump to 1.0.5
Updating version 1.0.5
Merge branch 'master' of github.com:cumbreras/funky-select

Conflicts:
	app/assets/javascripts/global/supa-uploader/templates/supa-uploader.jst.ejs
	app/assets/stylesheets/funky-uploader.scss
Merge branch 'master' of github.com:cumbreras/funky-select
Adding progress callback
Merge branch 'master' of github.com:cumbreras/funky-select

Conflicts:
	app/assets/stylesheets/funky-uploader.scss
Merge branch 'master' of github.com:cumbreras/funky-select

Conflicts:
	app/assets/javascripts/funky-toolset.js
	app/assets/stylesheets/funky-uploader.scss
	features/step_definitions/funky_uploader_steps.rb
Merge branch 'master' of https://github.com/cumbreras/funky-select
Using css from manifest
Refactoring select box code to a module
refactoring into a rails form helper
Removing unneeded files