new structure
new structure
Merge remote-tracking branch 'origin/master'

Conflicts:
	vish/.classpath
	vish/.gitignore
	vish/.settings/com.google.gdt.eclipse.core.prefs
	vish/.settings/org.eclipse.wst.common.component