Edit interface and parser
add users, authentication and other
delete for merge
ok
Merge branch 'develop'
edit files
Merge branch 'develop'

Conflicts:
	models/spare.js
	package.json