重做登陆
修改注册
修改【修改信息】 只是原型
Merge branch 'master' of https://github.com/daniyuu/GiveMeFive into fix_table_head

Conflicts:
	Givemefive/.gradle/1.10/taskArtifacts/cache.properties.lock
	Givemefive/.gradle/1.10/taskArtifacts/fileHashes.bin
	Givemefive/.gradle/1.10/taskArtifacts/fileSnapshots.bin
	Givemefive/.gradle/1.10/taskArtifacts/taskArtifacts.bin