start adding user guide documentation
add build of site
typo
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml