Initial sync up of JDev and Git