Added SPI and Exocortex projects
Resolved conflicts