Merge branch 'dev' into thy
decorate dashboard, rectify login bug
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
Merge branch 'thy' into dev
Merge branch 'ricky' into dev
合并冲突
tiny bugs(team)
setting加入jquery效果；可以修改用户名