Rest proxy
Merge branch 'master' of https://github.com/perchten/BP-Scanly

Conflicts:
	package.json