fix strong params on import
add image to strong params
fix irrelevant strong checking
fix import test
remove extraneous param
Merge pull request #510 from concerto/template_strongparams

fix strong params on template import
Groups page layout changes
Merge remote-tracking branch 'upstream/master'