move setting colspan before ater/before, sometimes changing colspan scrolls page
fix searching when includes is set to nil
fix searching when includes is set to nil
test for setting nil in includes
test validation reflection
fix bridge tests
fix tests for ruby 2
fix tests on ruby 2
Merge branch 'master' into rails4