commit -011-
Merge branch 'master' of https://github.com/avbubnov/wall.git

Conflicts:
	src/wall/home/Image.java