fix Gemfile
Merge branch 'dev' of git://github.com/have2testo/image_uploader
merge 20130313
before demos 20130314