things
Merge branch 'charakter_edit' of https://github.com/stupacki/CA_2014_PROJECT_DATA into charakter_edit

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