fix version
ignore project properties
Merge branch 'master' of https://github.com/belmen/CareCoordinator.git

Conflicts:
	project.properties