Put project.properties in git ignore
Merge branch 'master' into denis