stage2 is in and out
Merge branch 'master' of github.com:cointhink/rails