edit activation check null
edit
Merge branch 'master' of https://github.com/nguyen-thuong-mulodo/DraftPlayer.git