Added chat functionality and UI for alliances
Merged with master