Several minor fixes
Merge remote-tracking branch 'upstream/master'
Merge pull request #733 from SebastianLopienski/master

Several minor fixes to apps.json