updated views
Merge branch 'master' of github.com:Singularity623/AnybodyOutThere
layouts: eclipse/lint warnings will be taken care of