[WIP] before merge
Merge branch 'debt/234-split-views' into feature/274-bulk-edit-from-bob

Conflicts:
	src/ralph_assets/views/asset.py
[WIP] bulk with django-bob
added raw_id_filed for ForeignKey
[WIP] bulk in progress
[WIP] added test to bulk
review fixes
added migration file (budget_info field)
Merge branch 'develop' into cut-budget-info

Conflicts:
	src/ralph_assets/views_search.py
fixed failed auto-merge
[WIP]
Merge branch 'xliiv-cut-budget-info' into develop
fixed problem with autocompleted
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' into feature/273-bulk-edit-from-bob

Conflicts:
	src/ralph_assets/admin.py
	src/ralph_assets/models_sam.py
	src/ralph_assets/views/asset.py
	src/ralph_assets/views/transition.py
fixed duplicate class
after review
fixed pyflake errors
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	src/ralph_assets/forms.py
Merge branch 'develop' into feature/273-bulk-edit-from-bob

Conflicts:
	src/ralph_assets/models.py
	src/ralph_assets/tests/utils/sam.py
	src/ralph_assets/urls.py