use Requirejs and test
solve all conflic before merge to requirejs
commit for require
Merge branch 'master' of ../BattleOfArtillery_Require