User settings start
Merge branch 'user-settings' into refactor

Conflicts:
	library.js
	plugin.json