Github master fixes

The fix in framer-nullmac is straightforward: it does not compile without it.
The build.xml change is necessary to compile cooja with java version "1.7.0_45", at least on my mac...