work7
work8
master 7-7
work8-8
Merge branch 'master' into work7

Conflicts:
	.idea/workspace.xml
	src/com/example/zakolebalo/MyActivity.java