dev::NLB-5::game.timer function should not be defined
Merge remote-tracking branch 'origin/master'