Merge branch 'development' of https://github.com/XORwell/lnpaste into development

Conflicts:
	manifest.json
Merge branch 'development' of https://github.com/XORwell/lnpaste into development

Conflicts:
	manifest.json