macro project version
Merge branch 'NJF-project-version' into develop