Issue #197, #191
Merge branch 'master' of github.com:ceskaexpedice/kramerius

Conflicts:
	client/src/main/java/cz/incad/kramerius/client/tools/ConfTool.java
	client/src/main/java/cz/incad/kramerius/client/tools/Search.java
	client/src/main/webapp/WEB-INF/css/styles.css
	client/src/main/webapp/WEB-INF/viewer.vm
	client/src/main/webapp/js/app.js