Removed uneeded files for linux build.
Merge branch 'windows-beta' into linux-beta
Removed test message for testing linux and windows merging.