diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.aps b/Demos/Device/ClassDriver/AudioInput/AudioInput.aps
new file mode 100644
index 0000000000..324c914017
--- /dev/null
+++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.aps
@@ -0,0 +1 @@
+AudioInput13-Jul-2010 15:22:2813-Jul-2010 15:22:44241013-Jul-2010 15:22:2844, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Device\ClassDriver\AudioInput\AVR ONE!falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000AudioInput.cDescriptors.cAudioInput.hDescriptors.hmakefiledefaultYESmakefileatmega12811
AudioInput.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.aps b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.aps
new file mode 100644
index 0000000000..e6086f293f
--- /dev/null
+++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.aps
@@ -0,0 +1 @@
+AudioOutput13-Jul-2010 15:23:0013-Jul-2010 15:23:23241013-Jul-2010 15:23:0044, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Device\ClassDriver\AudioOutput\AVR ONE!falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000AudioOutput.cDescriptors.cAudioOutput.hDescriptors.hmakefiledefaultYESmakefileatmega12811
AudioOutput.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.aps b/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.aps
new file mode 100644
index 0000000000..78bf27c99e
--- /dev/null
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.aps
@@ -0,0 +1 @@
+DualVirtualSerial13-Jul-2010 15:24:2013-Jul-2010 15:25:07241013-Jul-2010 15:24:2044, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Device\ClassDriver\DualVirtualSerial\AVR ONE!falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cDualVirtualSerial.cDescriptors.hDualVirtualSerial.hmakefiledefaultYESmakefileatmega12811
DualVirtualSerial.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/GenericHID/GenericHID.aps b/Demos/Device/ClassDriver/GenericHID/GenericHID.aps
new file mode 100644
index 0000000000..175367264c
--- /dev/null
+++ b/Demos/Device/ClassDriver/GenericHID/GenericHID.aps
@@ -0,0 +1 @@
+GenericHID13-Jul-2010 15:26:0413-Jul-2010 15:26:18241013-Jul-2010 15:26:0444, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Device\ClassDriver\GenericHID\AVR ONE!falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cGenericHID.cDescriptors.hGenericHID.hmakefiledefaultYESmakefileatmega12811
GenericHID.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/Joystick/Joystick.aps b/Demos/Device/ClassDriver/Joystick/Joystick.aps
new file mode 100644
index 0000000000..48b14478b0
--- /dev/null
+++ b/Demos/Device/ClassDriver/Joystick/Joystick.aps
@@ -0,0 +1 @@
+Joystick13-Jul-2010 15:27:0813-Jul-2010 15:27:41241013-Jul-2010 15:27:0844, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Device\ClassDriver\Joystick\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cJoystick.cDescriptors.hJoystick.hmakefiledefaultYESmakefileatmega12811
Joystick.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exeC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Device\ClassDriver\Joystick\Descriptors.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Device\ClassDriver\Joystick\Joystick.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Device\ClassDriver\Joystick\Descriptors.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Device\ClassDriver\Joystick\Joystick.c
diff --git a/Demos/Device/ClassDriver/Keyboard/Keyboard.aps b/Demos/Device/ClassDriver/Keyboard/Keyboard.aps
new file mode 100644
index 0000000000..17f9235994
--- /dev/null
+++ b/Demos/Device/ClassDriver/Keyboard/Keyboard.aps
@@ -0,0 +1 @@
+Keyboard13-Jul-2010 15:27:5513-Jul-2010 15:28:59241013-Jul-2010 15:27:5544, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Device\ClassDriver\Keyboard\AVR ONE!falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cKeyboard.cDescriptors.hKeyboard.hmakefiledefaultYESmakefileatmega12811
Keyboard.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.aps b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.aps
new file mode 100644
index 0000000000..45a654fac7
--- /dev/null
+++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.aps
@@ -0,0 +1 @@
+KeyboardMouse13-Jul-2010 15:29:1113-Jul-2010 15:29:25241013-Jul-2010 15:29:1144, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Device\ClassDriver\KeyboardMouse\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cKeyboardMouse.cDescriptors.hKeyboardMouse.hmakefiledefaultYESmakefileatmega12811
KeyboardMouse.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/MIDI/MIDI.aps b/Demos/Device/ClassDriver/MIDI/MIDI.aps
new file mode 100644
index 0000000000..6a3e353836
--- /dev/null
+++ b/Demos/Device/ClassDriver/MIDI/MIDI.aps
@@ -0,0 +1 @@
+MIDI13-Jul-2010 15:34:1013-Jul-2010 15:34:27241013-Jul-2010 15:34:1044, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Device\ClassDriver\MIDI\AVR ONE!falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cMIDI.cDescriptors.hMIDI.hmakefiledefaultYESmakefileatmega12811
MIDI.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/MassStorage/MassStorage.aps b/Demos/Device/ClassDriver/MassStorage/MassStorage.aps
new file mode 100644
index 0000000000..a86a884988
--- /dev/null
+++ b/Demos/Device/ClassDriver/MassStorage/MassStorage.aps
@@ -0,0 +1 @@
+MassStorage13-Jul-2010 15:29:5313-Jul-2010 15:30:15241013-Jul-2010 15:29:5344, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Device\ClassDriver\MassStorage\AVR ONE!falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cMassStorage.cLib\DataflashManager.cLib\SCSI.cDescriptors.hMassStorage.hLib\DataflashManager.hLib\SCSI.hmakefiledefaultYESmakefileatmega12811
MassStorage.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.aps b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.aps
new file mode 100644
index 0000000000..51af33cde2
--- /dev/null
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.aps
@@ -0,0 +1 @@
+MassStorageKeyboard13-Jul-2010 15:30:5513-Jul-2010 15:31:22241013-Jul-2010 15:30:5544, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Device\ClassDriver\MassStorageKeyboard\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cMassStorageKeyboard.cLib\DataflashManager.cLib\SCSI.cDescriptors.hMassStorageKeyboard.hLib\DataflashManager.hLib\SCSI.hLib\SCSI_Codes.hmakefiledefaultYESmakefileatmega12811
MassStorageKeyboard.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/Mouse/Mouse.aps b/Demos/Device/ClassDriver/Mouse/Mouse.aps
new file mode 100644
index 0000000000..556bec1a6d
--- /dev/null
+++ b/Demos/Device/ClassDriver/Mouse/Mouse.aps
@@ -0,0 +1 @@
+Mouse13-Jul-2010 15:34:5813-Jul-2010 15:35:19241013-Jul-2010 15:34:5844, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Device\ClassDriver\Mouse\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cMouse.cDescriptors.hMouse.hmakefiledefaultYESmakefileatmega12811
Mouse.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.aps b/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.aps
new file mode 100644
index 0000000000..e53afe0601
--- /dev/null
+++ b/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.aps
@@ -0,0 +1 @@
+RNDISEthernet13-Jul-2010 15:36:0013-Jul-2010 15:36:36241013-Jul-2010 15:36:0044, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Device\ClassDriver\RNDISEthernet\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cRNDISEthernet.cLib\ARP.cLib\DHCP.cLib\Ethernet.cLib\ICMP.cLib\IP.cLib\ProtocolDecoders.cLib\TCP.cLib\UDP.cLib\Webserver.cDescriptors.hRNDISEthernet.hLib\ARP.hLib\DHCP.hLib\Ethernet.hLib\EthernetProtocols.hLib\ICMP.hLib\IP.hLib\ProtocolDecoders.hLib\TCP.hLib\UDP.hLib\Webserver.hmakefiledefaultYESmakefileatmega12811
RNDISEthernet.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.aps b/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.aps
new file mode 100644
index 0000000000..b0ae4c9a80
--- /dev/null
+++ b/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.aps
@@ -0,0 +1 @@
+VirtualSerial13-Jul-2010 15:37:0513-Jul-2010 15:37:20241013-Jul-2010 15:37:0544, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Device\ClassDriver\VirtualSerial\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cVirtualSerial.cDescriptors.hVirtualSerial.hmakefiledefaultYESmakefileatmega12811
VirtualSerial.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.aps b/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.aps
new file mode 100644
index 0000000000..bc2cf725eb
--- /dev/null
+++ b/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.aps
@@ -0,0 +1 @@
+VirtualSerialMouse13-Jul-2010 15:37:4813-Jul-2010 15:38:03241013-Jul-2010 15:37:4844, 18, 0, 685AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Device\ClassDriver\VirtualSerialMouse\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cVirtualSerialMouse.cDescriptors.hVirtualSerialMouse.hmakefiledefaultYESmakefileatmega12811
VirtualSerialMouse.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe
diff --git a/LUFA.pnproj b/LUFA.pnproj
index 5d75eb59d4..fa1f70d010 100644
--- a/LUFA.pnproj
+++ b/LUFA.pnproj
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 4be60737fb..6f1bc3ae60 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -14,7 +14,7 @@
* - Added new pgm_read_ptr() macro to Common.h for reading of pointers out of flash memory space
* - Added new SWAPENDIAN_16() and SWAPENDIAN_32() macros to Common.h for statically initialized variables at compile time
* - Added new Drivers/USB/LowLevel/Device.c file to house Device mode specific functions that are more complicated than simple macros
- * - Added new AVRStudio 4 project files for all library projects and bootloaders
+ * - Added new AVRStudio 4 project files for all library demos, projects and bootloaders
*
* Changed:
* - The RingBuff library code has been replaced in the XPLAINBridge, Benito and USBtoSerial projects with an ultra lightweight