fixed project.properties conflicts
Merge pull request #16 from nevsaynev/conflictsFix2

fixed project.properties conflicts