Merge pull request #1 from goddardmorse/dev

Merge src and dev, create new dev branch afterwards
Merge pull request #2 from goddardmorse/dev

Moving to src branch
Merge pull request #3 from goddardmorse/src

Delete src branch after merge