Backend updates merge

Merged
https://github.com/AuditeMarlow/NLX-Webshop/commit/84ade72998582f70653785d37b4ee45175c0a1c3
with master.