merge develop -D org -I include -E exclude: PR 351 (Add SPW support to FakeReader)
merge develop -D org -I include -E exclude: PR 424 (Specification changes for 2013-06 release)
merge develop -D org -I include -E exclude: PR 427 (xsd-fu: Generate sources at build time)
merge develop -D org -I include -E exclude: PR 433 (More .nd2 fixes (rebased onto develop))