end of merge
Merge branch 'dev' of github.com:SlideSyncOrg/SlideSync into dev

Conflicts:
	server/methods.js
Merge branch 'dev' of github.com:SlideSyncOrg/SlideSync into dev