don't fail when both formtastic and simple form are loaded
Nested associations seem to be working
Add RailsAdmin support and sorting
rakefile
Updates for rails_admin
Fix sort bug
readme
Bug
Some code cleanup
fixes
gemfile
readme
Update application.js
fix file loading when exists (rails_admin)
fix readme
fixes, readme, etc
Merge branch 'master' of https://github.com/glebtv/rails-uploader

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/uploader/application.js
	app/assets/javascripts/uploader/jquery.fileupload-ui.js
	app/assets/javascripts/uploader/jquery.fileupload.js
	app/assets/javascripts/uploader/jquery.iframe-transport.js
	app/assets/stylesheets/uploader/default.css
	app/controllers/uploader/attachments_controller.rb
	app/views/uploader/default/_container.html.erb
	app/views/uploader/default/_download.html.erb
	config/routes.rb
	lib/uploader/asset.rb
	lib/uploader/fileuploads.rb
	lib/uploader/helpers/field_tag.rb
	lib/uploader/hooks/formtastic.rb
	lib/uploader/hooks/simple_form.rb
	lib/uploader/version.rb
	rails-uploader.gemspec
	vendor/assets/javascripts/uploader/jquery.ui.widget.js