Merge branch 'master' of https://github.com/gustavocesar/cake_admin.git