Buttons
Merge branch 'master' of github.com:ceskaexpedice/k5client

Conflicts:
	src/main/webapp/WEB-INF/viewer.vm
	src/main/webapp/js/item.js
	src/main/webapp/js/item_thumbs.js