Merge remote-tracking branch 'tgascoigne/development' into 'development'.
Update the project file to correct mistakes.
Add '.gitignore'.