switched to rspec3 style test
Merge remote branch 'origin/master'
installed blacklight-gallery
merge