add some functionality
Merge remote-tracking branch 'origin/master'

Conflicts:
	webapp/webapp/src/main/webapp/localserver.html
	webapp/webapp/src/main/webapp/servers.html
fix cart quantity