Still working out paths for the assets package
Fixes linker errors when setting Deployment target to 7.0
Merge branch 'develop' into pdev