Added show item activity
Merge branch 'master' of
https://github.com/chelaleung/software-engineering.git

Conflicts:
	BarterNBargain/res/values/strings.xml