modify
Merge branch 'master' of https://github.com/pli2014/duty
Merge branch 'master' of https://github.com/pli2014/duty.git
test
commit
commit
Merge branch 'master' of https://github.com/pli2014/duty

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.core.resources.prefs
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.component
add backend user login and register