Template repair and design improvements
Merge branch 'master' of https://github.com/akovacic/PictureTool

Conflicts:
	PictureTool/Helpers.cs
Merge branch 'master' of https://github.com/akovacic/PictureTool

Conflicts:
	PictureTool/Form1.Designer.cs
	PictureTool/Form1.cs
	PictureTool/Form1.resx
	PictureTool/Helpers.cs