fixed delete test; fixed functionality to work with usernames instead of ids
Merge branch 'dev' of https://github.com/NiamNiam/NiamServices into dev

Conflicts:
	server.js
finally fixed all conflicts;