Merge branch 'charakter_edit' into gui_edit
Merge branch 'charakter_edit' into gui_edit
1st draft of startmenu (incl. functional sliders for count and gender)
Merge branch 'gui_edit' of https://github.com/stupacki/CA_2014_PROJECT_DATA into gui_edit

Conflicts:
	Project/Assets/Scenes/Test_Scene.unity
Merge branch 'gui_edit' of https://github.com/stupacki/CA_2014_PROJECT_DATA into gui_edit
Merge branch 'charakter_edit' into gui_edit
Merge branch 'gui_edit'