Merge pull request #1 from sanmiguel/develop

Purge unnecessary code
Merge branch 'develop'
Change to a real application layout