Adding site documentation
Added documentation
Merge branch 'master' into develop

Conflicts:
	pom.xml