Merge branch 'master' of github.com:gyzerok/nash

Conflicts:
	ImageParser/AnchorPlacer.cs
none
image parser deleted