fix login
Merge branch 'develop' into KHuy_31_fight
edit login, attacking work, animation work
Merge branch 'database' into KHuy_31_fight

Conflicts:
	App_Data/webgame.mdf
	App_Data/webgame_log.ldf
Hoàn thành Fight, sửa login, signup
Merge branch 'KHuy_31_fight' into develop

Conflicts:
	App_Data/webgame.mdf
	App_Data/webgame_log.ldf