merged develop into feature/frontend-CSS-styling