Lade till brows, highlight, learn and save
Merge branch 'Martin'
Merge branch 'master' into Sebastian