ljj_commit02
ljj_debug

Conflicts:
	ApplicationSystem/.settings/org.eclipse.core.resources.prefs