Fixes #66
Merge & Fixes #66

Conflicts:
	src/org/touchirc/adapter/ExpandableUserAdapter.java
	src/org/touchirc/fragments/ConnectedUsersFragment.java