check box bug fix
Merge branch 'marionette_dev' into gh-pages