Merge branch 'release/1.0'
Updating version numbers to simulate a hotfix.
Merge branch 'hotfix/sample-hotfix' into develop

Conflicts:
	WebServerLib/pom.xml
	WebServerProcess/pom.xml
	pom.xml