以sell2 为原型 构建项目
Main
Merge branch 'master' of https://github.com/wangjian2254/Sell3.git

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	res/layout/login.xml
	res/values/strings.xml
	res/values/styles.xml
	src/com/wj/sell3/Main.java