font-awesome fix
Merge branch 'master' of github.com:eduardovrocha/rails

.. merge from Xitão
fix database.yml