Fixing apimod log display error
Remove global $corp_npc. NPC status can be found from external id instead.
Removing corp logos. Corp logos are now retrieved from CCP's image server.
Removing unneeded code.
Colour code security status when not using combined kills (i.e. red text on red background)
corp_detail page will not link to the 'None' alliance page.
system_detail page will show more than 20 kills
Kill class correctly updates last modified time in kb3_mails
Unset variables $pilot/$corp/$alliance after use in index.php. The variable names are commonly reused.
Allow mods to change a template name to one outside the theme hierarchy for non-default themes.
Allow mods to change a template name to one outside the theme hierarchy for non-default themes. *And* remove the debug code.
Add a no banner option.
Adding a getTitle function to Page for mods to use.
Escape quotes in xml. Broke install on some (rare?) systems.
Create new cache directories on install.
Session name no longer exposes site internal id.
Create corp and alliance summaries without temporary tables. Make functions used statically static. Partial work on Issue 147.
Adding faction fetch changes from http://eve-id.net/forum/viewtopic.php?p=31192#p31192

First time using TortoiseMerge so hopefully I didn't mess it up.
Helps if you actually commit everything.
Create pilot, corp and alliance summaries without temporary tables. Includes all kills and losses, unlike previous revision. Fixes Issue 147.