Fix merge conflict.
Changed namespace and fixed TN Datastream [I think]

Changed islandora_bioinformatics_base.module and all bioinformatics
namespaces are now
Changed image_upload.form.inc method name

Changed name of the method form and the related callback in .module
Changed image_upload.form.inc
Added parameter to image_upload.form.inc
Please Work
Changed OBJ to IMG in image_upload.form.inc
Space
More spaces
Change CModel names. Change image_upload.form.inc name.
Added Project Collection Policy
Add project_collection to the file.
Add project_collection to the file.
Add empty hooks for theme, menu, cmodel_pid_islandora_view_object.
Filled out cmodel_pid_islandora_view_object hooks.
More theme stuff.
Remove unwated space.
God damn slash.
God damn bracket.
Changed Image for persons from Folder.png to Person.png