ctcp
Merge branch 'master' of github.com:WeHeartGaming/Codename-WHIRC

Conflicts:
	WHIRC/src/no/whg/whirc/models/Conversation.java