fixed warning error on in console when pressing playnow or playoldschool
Merge remote-tracking branch 'origin/development' into bleeding-edge