Merge pull request #243 from ahundt/feature/custom-doc-style

Improve message when there is an error in the modify project mode of the project tool.
Merge pull request #245 from ahundt/develop

Merge selected changes from develop into master branch.
Merge commit 'f30ea03f5b627ef42cdde9eaf4d4c9cb1309463d' into develop