Revert "Merge branch 'master' of https://github.com/Anika1/Pictor"

Conflicts:
	Pictor/PicViewController.m
some github errors...