Merge origin/master

Conflicts:
	src/java/com/mtpa/visitorbean/Comment.java
	src/java/com/mtpa/visitorbean/CommentStore.java
	src/java/com/mtpa/visitorbean/VisitorBean.java
	web/index.xhtml
	web/result.xhtml