this was never pushed?
Merge branch 'master' of https://github.com/mshoward/SAWND

Conflicts:
	doc/VAD structure.xml