Working on the banter room list, creating its custom adapter
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/menu/banterroomactionbar.xml