-fix same problem
Merge branch 'master' of https://github.com/michalciolek/temp.git

Conflicts:
	test.mcl/src/com/example/test/mcl/MichaelActivity.java