small fixes
Merge branch 'master' of https://github.com/Anika1/Pictor

Conflicts:
	Pictor/Base.lproj/Main.storyboard