.
Merge branch 'master' of https://github.com/greatdg/Titaniumstudy

Conflicts:
	app/views/list.xml