check if all implemented
Merge origin/master

Conflicts:
	src/main/webapp/PictureDiv.jsp