Merge branch 'develop' into client-refactor

# Conflicts:
#	package-lock.json
#	package.json
#	server/notes/file_system/file_system.py

Author: dullage