yin-----shushe
yin----dormtory
dormtory
合并一些冲突
wjw
kelin 初步实现登录

初步实现登录，实现BaseAuth
类，修改相应的xml文件，loginActivity新增加“记住密码”选项，History做小部分改动，列表选中有待增加功能
Merge branch 'master' of https://github.com/yinchuandong/Library

Conflicts:
	bin/Library.apk
	bin/classes.dex
	bin/classes/com/gw/library/base/BaseAuth.class
	bin/classes/com/gw/library/base/C$task.class
	bin/classes/com/gw/library/model/User.class
	bin/classes/com/gw/library/ui/HistoryActivity$1.class
	bin/classes/com/gw/library/ui/HistoryActivity.class
	bin/classes/com/gw/library/ui/LauncherActivity$1.class
	bin/classes/com/gw/library/ui/LauncherActivity.class
	bin/classes/com/gw/library/ui/LoginActivity$1.class
	bin/classes/com/gw/library/ui/LoginActivity.class
	bin/resources.ap_
	res/layout/ui_login.xml
	src/com/gw/library/base/BaseAuth.java
	src/com/gw/library/base/C.java
	src/com/gw/library/model/User.java
	src/com/gw/library/ui/HistoryActivity.java
	src/com/gw/library/ui/LauncherActivity.java
	src/com/gw/library/ui/LoginActivity.java
合并了一些冲突，去掉了罗可林的登录部分，注意命名规范，Java变量和函数不要用下划线
解决冲突
wjw
wjw
完成了remindActivity的一部分
完成remindactivity
wangjiewen
wjw
wjw
wjw
luo
luo
luo