fixed button overlap in french option sets form
Merge branch 'staging' into develop
improved debug logging
added test for question rank change
added assertions to standardizable
Merge branch 'develop' into staging
fixed error in matchers.rb
Merge branch 'develop' into staging