Merge remote-tracking branch 'origin/feature-version3.0' into feature-version3.0
Revert removing build.properties, and revert changes to .gitignore