Fixed constant merge conflicts in build.properties
Git will now automatically "skip" build.properties while merging so that individual settings will be kept