edit
Merge branch 'dev' of https://github.com/leekeal/linux-web-gui into dev

Conflicts:
	server/stores/database.json
Merge branch 'dev' of https://github.com/leekeal/linux-web-gui into dev