cambios
merge grnutfile
pequenos fix text y photo
Merge branch 'master-fluid-ui' of github.com:javrod83/the_fram into master-fluid-ui
cambios flujo app