Creating Constants XML
Merge remote-tracking branch 'origin/dev' into feature-emlowry2
Working on constant loading
Finished constant loading
Fix to initial wave count
Fix to initial wave count