Build Files updated
Fixed things that broke
Merge branch 'master' into MergeIssues2