Merge branch 'develop' into feature/endpoints-filtering

Conflicts:
	Resources/public/css/screen.css