Merge branch 'ebay_service' of https://github.com/tinazheng/teluxe

Conflicts:
	app/app.js
	app/index.html
	app/index/index.html
	app/test/test.html