Merge branch 'hotfix/1.5.1'
Latest GitCake with fixed path issues
Fix really dumb problem where we're not returning the config in AppShell
Merge branch 'hotfix/1.5.2' into develop