orientation portrait
Merge pull request #18 from juancjara/master

update dev
conflict fixed
icons and margin removed
Merge pull request #20 from juancjara/development

Development