increase default requirejs waitSeconds value & fix bug when associating new key
Merge branch 'master' into backends