Merge branch 'master', remote-tracking branch 'origin'
Fixed missing Eclipse project files and added desktop project.