small changes
Merge branch 'development' of github.com:wva/prismaToolbox into wva/prismaToolbox.git_development

Conflicts:
	prismaToolbox.v11.suo
Changed design of Edit Form for active directory