Add project.properties to .gitignore.
Merge remote-tracking branch 'origin'