Merge branch 'master' into frontend
Latest changes before last week's meeting
Merge branch 'frontend'
resolving master branch conflicts