added all
Merge branch 'master' of https://github.com/edenzik/128Project

Conflicts:
	wizard/src/main/java/com/wrangler/ui/fd/FDPanel.java