Merge branch 'scoop-develop'

Signed-off-by: Jeremy Ho <jujaga@gmail.com>
Reimplement jquery-rails lock on 1.0.19

Signed-off-by: Jeremy Ho <jujaga@gmail.com>
Merge branch 'master' into scoop-develop

Signed-off-by: Jeremy Ho <jujaga@gmail.com>