Added Map Manager, VS13 upgrade, better out-of-class handling