Testcommit
Testcommit
Merge branch 'gui_edit' of https://github.com/stupacki/CA_2014_PROJECT_DATA into gui_edit
Fixed a problem wirth FamaleCharGeneration
Merge branch 'gui_edit' of https://github.com/stupacki/CA_2014_PROJECT_DATA into gui_edit

Conflicts:
	Project/Project-csharp.sln
	Project/Project.sln