Merge branch 'development'
added project files
Merge branch 'master' into development