Minor updates, changing apps to projects
Merge branch 'master' into personal