Merge branch 'master' into merge_resources

# Conflicts:
#	pom.xml

src/main/resources/appresource.properties

@@ -256,8 +256,8 @@ knowledge.view.comment.open=Open
 knowledge.view.comment.collapsed=Collapsed
 knowledge.view.comment.collapse.on=Collapsed
 knowledge.view.comment.collapse.off=Opened
-knowledge.view.info.insert={1} was written at {2} 
-knowledge.view.info.update={1} was updated at {2} 
+knowledge.view.info.insert=written by {1} at {2}
+knowledge.view.info.update=updated by {1} at {2}
 knowledge.view.info.history=History
 knowledge.view.label.show.toc=Show TOC
 knowledge.view.label.copy.url=Clip Page URL