layout 03/12
Merge branch 'master' of github.com:eduardovrocha/rails

merge from Xitão