Wizard.
Merge branch 'i006_z001' of https://github.com/bbsszz/pikto into i006_z001

Conflicts:
	PiktoSolution/PiktoProject/PiktoProject.csproj