简单的调整
Merge branch 'dev' of github.com:JYWa/teamstyle16 into dev
merge
弹出问题
merge
merge
Merge branch 'dev' of github.com:JYWa/teamstyle16 into dev
解决不能正确弹出问题
优化了login界面
粘性表单功能完成
添加伪快速注册功能
写了一个非常粗糙的文件上传功能
Merge branch 'ricky' into dev
merge
Merge branch 'thy' into dev
Merge branch 'dev' of github.com:JYWa/teamstyle16 into dev

Conflicts:
	application/_install/02-create-tables.sql
add }
Merge branch 'dev' into thy
floating windows now usable