updated project for universal build
merge with latest
fixed build issues from last push