Merge branch 'development' into 'development'

Add lock files to .gitignore and small styling changes

See merge request !14
3 jobs for development in 1 minute and 41 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Build
passed #10605
build

00:01:29

manual #10606
allowed to fail manual
build_shopmason
 
  Deploy
passed #10607
deploy_staging

00:00:12