Merge pull request #8 from juancjara/master

update dev
back button
fixed conflicts
Merge pull request #9 from juancjara/development

Development