Changed upload logo
Merge branch 'addingTypes'
Merge branch 'addingTypes'
Merge branch 'addingTypes'

Conflicts:
	app/views/catalog/_actions.html.erb
Bundle deployment copies gems to vendor/bundle. Did not want gems pushed to git. So ignored this directory.
The rake task to migrate the db, may have modified this
Testing Apache with passenger rails. For now setting production end points same as development.
Adding example users to role reviewer
Assets not loading in production. For now set compile assets to true.
Note: This is not recomended for an actual production environment as this is slow