Issue211

I added something in there to not show the "Organization" option if the current user has a null org.  Not sure if this meets business requirements though. Tests are all passing except for a few under ImageQuestion and ImagesQuestion.