Merge branch 'release/0.5'
Added files to framework target so manual framework build works
Merge branch 'master' into develop