smaill changes...
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/model/db.js
methods to retrieve data