Merge remote-tracking branch 'coyotte/design' into design
battle options part of the battle window
made username bg into time counter
removed frameborder from trainer info as well as a useless scrollbar
more teambuilder stuff
Merge remote-tracking branch 'jira/design' into design