should now be able to build whole project in eclipse
a bug fix in controlplaneextractor and some minor changes
Merge remote-tracking branch 'origin/unstable' into ratul