Merge from master, issue resolutions / mapfixes, events updates, admin updates

See commit log for more full descriptions. Highlights: 

- #2266, #2299, #2290, #2266, #2251
- Added new events, some from some unused old ones. 
- Unique text colours for alien language
- Removed moderators from adminwho, added their own separate proc