asdas
Merge branch 'master' of https://github.com/PetrKarbula/Fotki

Conflicts:

Fotki.xcodeproj/project.xcworkspace/xcuserdata/malykuba.xcuserdatad/User
InterfaceState.xcuserstate
	Fotki/Base.lproj/Main.storyboard
	Fotki/MainViewController.h
	Fotki/MainViewController.m
	Fotki/SidebarViewController.m