ProjectWizard
Fixed Wizards; Clean up some files
Solved Merging-Conflicts
Solved Merging-Conflict (messages.properties)