updated ui & add service

updated ui & add service
Merge branch 'ui'

Conflicts:
	dist/GaryUI.war