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

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