.
Merge branch 'master' of https://github.com/yzheng624/Sirius-Eclipse

Conflicts:
	res/layout/item_row.xml