.
Merge branch 'master' of https://github.com/Burlay/IkWordGezondAndroid

Conflicts:
	project.properties