Fix sidebar and main menu selected items
Merge branch 'develop' into ui-improvements

Conflicts:
	src/ralph_assets/views.py
Merge pull request #158 from quamilek/ui-improvements

Fix sidebar and main menu selected items