For merge
Merge branch 'master' of https://github.com/bugtsa/uKowelek

Conflicts:
	project.properties
Original Project propeties