fixes to issues #141 #143 and #128 for inline media
#141 Fixed error that broke regular add media
Merge pull request #145 from pencilblue/PB128

fixes to issues #141 #143 and #128 for inline media
#130 Removed references to carousel
#148 PB menu logo showing up where site_logo should be
Merge pull request #149 from pencilblue/PB148

#148 PB menu logo showing up where site_logo should be
Merge pull request #146 from pencilblue/PB130

#130 Removed references to carousel
Merge branch 'master' into story/PB140