update gitignore(add project.properties)
update ignore files
fix conflicts