corrected problems using paperclip
banner and logo
banner and logo images working correctly
fixed conflicts with cp-banner and develop