added basket property to User schema
added basket controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/config/routes.js
Fix merge