Merge branch 'feature/unread-line' into feature/preferences

Conflicts:
	ircSEXMessenger/src/main/java/se/chalmers/dat255/ircsex/ui/search/MessageArrayAdapter.java