Revert "fix merge problem"
Revert "fix merge problem"

This reverts commit 11b378e5d3e1d9ce9cd36608b2ac353f22278ef6.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch dev-staging
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   src/Lists/ReportBundle/Controller/SalesAdminController.php
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	src/Lists/CityBundle/Entity/City.php~
#	src/Lists/CompanystructureBundle/Entity/Companystructure.php~
#	src/Lists/ContactBundle/Entity/ModelContact.php~
#	src/Lists/ContactBundle/Entity/ModelContactLevel.php~
#	src/Lists/ContactBundle/Entity/ModelContactType.php~
#	src/Lists/DogovorBundle/Entity/Dogovor.php~
#	src/Lists/DogovorBundle/Entity/DogovorDepartment.php~
#	src/Lists/DogovorBundle/Entity/DogovorHandling.php~
#	src/Lists/DogovorBundle/Entity/DogovorHistory.php~
#	src/Lists/DogovorBundle/Entity/DopDogovor.php~
#	src/Lists/HandlingBundle/Entity/Handling.php~
#	src/Lists/HandlingBundle/Entity/HandlingCompetitor.php~
#	src/Lists/HandlingBundle/Entity/HandlingDogovor.php~
#	src/Lists/HandlingBundle/Entity/HandlingMessage.php~
#	src/Lists/HandlingBundle/Entity/HandlingMessageType.php~
#	src/Lists/HandlingBundle/Entity/HandlingMessageView.php~
#	src/Lists/HandlingBundle/Entity/HandlingMoreInfo.php~
#	src/Lists/HandlingBundle/Entity/HandlingMoreInfoType.php~
#	src/Lists/HandlingBundle/Entity/HandlingResult.php~
#	src/Lists/HandlingBundle/Entity/HandlingService.php~
#	src/Lists/HandlingBundle/Entity/HandlingStatus.php~
#	src/Lists/HandlingBundle/Entity/HandlingType.php~
#	src/Lists/LookupBundle/Entity/Lookup.php~
#	src/Lists/OrganizationBundle/Entity/Organization.php~
#	src/Lists/OrganizationBundle/Entity/OrganizationGroup.php~
#	src/Lists/OrganizationBundle/Entity/OrganizationType.php~
#	src/Lists/OrganizationBundle/Entity/OrganizationUser.php~
#	src/Lists/OrganizationBundle/Tests/Controller/OrganizationControllerTest.php~422360d... ItDoorsOper bundle created. Showing Department Info. Need updates.
#	src/Lists/RegionBundle/Entity/Region.php~
#	src/Lists/TeamBundle/Entity/Team.php~
#	src/SD/CalendarBundle/Entity/CalendarEvent.php~
#	src/SD/UserBundle/Entity/Group.php~
#	src/SD/UserBundle/Entity/Staff.php~
#	src/SD/UserBundle/Entity/User.php~
#	web/templates/core/plugins/table-tools/alt_init.html
#	web/templates/core/plugins/table-tools/alter_buttons.html
#	web/templates/core/plugins/table-tools/bootstrap.html
#	web/templates/core/plugins/table-tools/button_text.html
#	web/templates/core/plugins/table-tools/collection.html
#	web/templates/core/plugins/table-tools/defaults.html
#	web/templates/core/plugins/table-tools/index.html
#	web/templates/core/plugins/table-tools/multi_instance.html
#	web/templates/core/plugins/table-tools/multiple_tables.html
#	web/templates/core/plugins/table-tools/pdf_message.html
#	web/templates/core/plugins/table-tools/plug-in.html
#	web/templates/core/plugins/table-tools/select_multi.html
#	web/templates/core/plugins/table-tools/select_single.html
#	web/templates/core/plugins/table-tools/swf_path.html
#	web/templates/core/plugins/table-tools/tabs.html
#	web/templates/core/plugins/table-tools/theme.html
#	web/uploads/

itdoors/sd,itdoors/sd,itdoors/sd,itdoors/sd,itdoors/sd,itdoors/sd,itdoors/sd,itdoors/sd