Merged Kelmoir's bootloader change and fixed .project file conflict.