add master Seterday
add work Seterday
Merge branch 'master' into work-satarday

Conflicts:
	src/com/example/zakolebalo/MyActivity.java