Fix strongarm conflict with imagex_panels
Merge pull request #3 from mitchmac/7.x-panel-conflict

Bug Fix: imagex_user strongarm conflict with imagex_panels