cleanup
more cleanup
Updated demo popup messages
Updated project files
Merge branch 'dev'