Build stuff
Merge branch 'app-build'