removed untested code
Merge branch 'layout'
gitignore
app modifications