rails update
Merge branch 'master' of github.com:galulex/lazybox_demo