Updating makefiles to use CMlib and MFlib from GHAAS
Making virtual changes for testing git.
Reverting git test changes.
Making virtual changes for testing git.
Reverting after git test.
Adding /usr/local/share/ghaas/include to NetBeans code assistance.
__FILE__ argument added to Entering and Leaving functions.
Cleaning up Domonik's code.
Adding changes from Rob that include power plant.
Merge branch 'master' of ssh://tulip.ccny.cuny.edu/Users/ecr/balazs/Git/WBMplus
Completing the merge with Rob's code.
Small formatting.
Trying to revert Florian's changes and merge with Rob at the same time.
Merge rose:~/Projects/2012-02_NSF-EaSM_North-East_RM/Model/WBMplus

Conflicts:
	src/MDThermalPowerPlant.c
Changing copyright
I wish, I knew what I changed in MDIrrGrossDemand.c.
Updating configuration for Mountain Lion and NetBeans 7.2
Merge branch 'master' of ssh://tulip.ccny.cuny.edu/Users/ecr/balazs/Git/WBMplus
Suspicious configuration changes.
Suspicious configuration change.