gui shell
Merge branch 'ui'

Conflicts:
	.DS_Store
	.classpath