Merge branch 'develop' into feature/allocation-admin

Conflicts:
	src/ralph_scrooge/media/scrooge/app/common/service.js
	src/ralph_scrooge/media/scrooge/css/scrooge.css
	src/ralph_scrooge/menu.py
	src/ralph_scrooge/rest/menu.py
	src/ralph_scrooge/templates/ralph_scrooge/index.html