add rename
Merge branch 'master' of https://github.com/msandrock/buddyshopping

Conflicts:
	routes/place-new-order.js