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

Conflicts:
	src/ralph_assets/views/asset.py
Merge pull request #310 from quamilek/release/2.0.0-rc2

Release version 2.0.0-rc2
[WIP] bulk with django-bob
added raw_id_filed for ForeignKey
[WIP] bulk in progress
Merge pull request #313 from quamilek/hotfix/slots-in-dc

Hotfix - slots field is not shown when model category attribute ``is_blade`` is True
Bumped version to 2.0.1-rc2
[WIP] added test to bulk
[WIP]
fixed problem with autocompleted
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
Added asset id column to asset report
Version and init
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
resolved tests
Merge branch 'develop' into feature/273-bulk-edit-from-bob

Conflicts:
	src/ralph_assets/forms_sam.py