Changes on index.xml and index.js
Merge branch 'master' of https://github.com/spyrbri/yahoo_alloy_app

Conflicts:
	app/controllers/index.js
	app/views/row.xml