I have merged all the functional code of both repositories and am going to deploy it on the test server to start bug tracking.  Functional code is basically all the code that site sin the /planetlab/ dir of the web root.  This is all the basic code needed to interface with the API outside of drupal.  Any various configurations and drupal settings, we felt, were not necessary parts of the merge because one of the main strengths of using drupal is to allow each PLC to maintain their own GUI appearances and styles.  Once i start debugging and testing I'll post the big changes in the merge as I get to them and talk about the differences and reason for style of merge. 

Installation of both MyPLCs has begun and setup and syncronizing the DBs is underway. We will be spending the next few days documenting both sides of the code. We will stay in close contact with 1 Lab for the duration of documentation in case there are any questions from either team. The goal is to come up with a full diff list between the two code bases with logica descriptions of what the diff is and why it is good or bad so that both teams can discuss and come to a consensus of which should go and which should stay when we merge the two codebases.

There will be some things that should remaind different as there are some fundamental differences on how both teams do business, but for the most part the codebases should match as much as possible during the development process so that both teams can learn from each others successes and failures.

 Merging 1Lab and PLC web GUIs

 Works in progress:

• Installing both MyPLCs
• Documenting both GUIs
• Forming a diff document of the two
• Discussing the good and the bad
• Merging the two code bases