ggjs
erge branch 'master' of https://github.com/davidtiandao/demo

Conflicts:
	.metadata/.log
	.metadata/.mylyn/repositories.xml.zip
	.metadata/.plugins/org.eclipse.core.resources/.projects/demo/.indexes/af/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/demo/.indexes/e4/b9/22/81/46/53/3c/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/demo/.indexes/e4/b9/22/81/46/53/92/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/demo/.indexes/e4/b9/22/81/46/53/b5/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/demo/.indexes/e4/b9/db/81/46/53/bf/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/demo/.indexes/e4/b9/db/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/demo/.markers
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.core.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.server.core.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.xml.ui.prefs
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/3435648363.index
	.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2014/11/46/refactorings.history
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2014/11/46/refactorings.index
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/demo/2014/11/46/refactorings.history
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/demo/2014/11/46/refactorings.index
	.metadata/.plugins/org.eclipse.ltk.ui.refactoring/dialog_settings.xml
	.metadata/.plugins/org.eclipse.m2e.core.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.m2e.core/demo.lifecyclemapping
	.metadata/.plugins/org.eclipse.m2e.core/nexus/26522e0d83a422eed93329ece7565cfc/segments.gen
	.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/segments.gen
	.metadata/.plugins/org.eclipse.m2e.core/workspaceState.ser
	.metadata/.plugins/org.eclipse.m2e.core/workspacestate.properties
	.metadata/.plugins/org.eclipse.m2e.jdt/demo.container
	.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	.metadata/.plugins/org.eclipse.wst.internet.cache/cache.xml
	.metadata/.plugins/org.eclipse.wst.jsdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.wst.jsdt.core/indexes/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.wst.jsdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.wst.server.core/servers.xml
	.metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties
	.metadata/.plugins/org.eclipse.wst.xml.core/system_catalog.xml
	.metadata/version.ini
	Servers/.settings/org.eclipse.wst.server.core.prefs
	Servers/Tomcat v7.0 Server at localhost-config/server.xml