For Resolved
Merge branch 'ImplementingDCD' of https://github.com/rstarzl/Ewok into
ImplementingDCD

Conflicts:
	Ewok/src/Ewok/GlobalContext.java