changed the location of some code to a better place
Merge remote-tracking branch 'coyotte/design' into design
more battle window design
Merge branch 'design' of github.com:Jirachier/webclient into design
updated db