Merge branch 'master' into release
Merge branch 'master' into release
Merge branch 'master' into release
Merge branch 'master' into release
Added support for showing logo when uploading program
Merge branch 'release'