Merge branch 'master' of https://github.com/busheldirect/initial

Conflicts:
	client/templates/navigation/mainmenu/mybids.html
Resolving conflict with sell.js