implement bid feature
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/services/models.js
merge changes