Merge branch 'master' of 192.168.10.130:wrk/ded
added todos related to mockups
Merge branch 'master' of ../ded2
use cygpath so running as absolute path works on windows
Tab key to cycle among the entities
add "(Ctrl+G to stop)" to FPS measurement display
expand DED_TRIPLE_BUFFER to offer choice over imageType
Merge branch 'eeepc'

Conflicts:
	src/util/Util.java
remove trailing whitespace from previous merge
remove TODO about image maps (wrote separate script)