Changed gitignore to ignore gedit temp files (e.g. adhoc_setup~)
Moved creation of controller up to fix things.
Changed up the logging interfaces.
added ChatLog and ChatLogElement
Added ack logging to all packets we send except for acks.
Added packet logging to all packets we send receive, to track duplicates.
Merging peter into kevin
Fixed UDPUser chat logging.
Fixed UDPUser chat logging again.
Removed unneeded debugging messages.
Added removeElement method in AckLog, ChatLog and Log.
Initialized ackLogElement HashMap to avoid NullPointerExceptions when removing elements from a non-existing map.
Added removal of users when inactive for > 35 seconds.
Added removal of ACKs when not acked for > 180 sconds.
Added resending of messages when not acked for > 14.8 seconds.
Added global encryption switch to make debugging easier.
Added automatic addition of acks to ackLog.
Fixed layout of BroadcastMessages.
Added LUA plugin for Wireshark to parse SAMPCA traffic
Merge conflicts