Merge branch 'dev' of https://github.com/picbury/Picbury into dev

Conflicts:
	Picbury/FriendsViewController.m
Merge branch 'dev' of https://github.com/picbury/Picbury into dev

Conflicts:
	Picbury/FriendsViewController.m