Merge branch 'master' into develop

# Conflicts:
#	src/main/asciidoc/architectureDocumentation/architectureDocumentation.adoc
tree: 7fc575f5ad53e8d62bd521a4fb712ffdcbc24ecf
  1. get_started.txt
  2. pom.xml
  3. src/