Sync
Merged branches manually
More fixes
Removed .metadata
Cleaning up
Merge remote-tracking branch 'origin/AppEng' into AppEng