Merge branch 'master' into 'Sprint2'

# Conflicts:
#   src/app/articles/articles.component.ts
#   src/app/navbar/navbar.component.html
#   src/app/navbar/navbar.component.scss
#   src/app/shared/services/article.service.ts
#   src/app/shared/services/result.service.ts