cleaned up user views, stubbed out profile
removed local log files
Merge branch 'v1.0' into develop
Merge branch 'develop'