Project updates
Merge fixes
Version update
Project file updates.
Merge
project updates