- Profile informations
Merge branch 'master' of https://github.com/eMxPi/Coffeed

Conflicts:
	Coffeed.xcodeproj/project.pbxproj

Coffeed.xcodeproj/project.xcworkspace/xcuserdata/cdstransporteur.xcuserd
atad/xcdebugger/Expressions.xcexplist

Coffeed.xcodeproj/xcuserdata/cdstransporteur.xcuserdatad/xcdebugger/Brea
kpoints_v2.xcbkptlist

Coffeed.xcodeproj/xcuserdata/maximepontoire.xcuserdatad/xcdebugger/Break
points_v2.xcbkptlist
	Coffeed/Authentification.h
	Coffeed/Authentification.m
	Coffeed/Base.lproj/Main.storyboard
	Coffeed/ConnexionViewController.h
	Coffeed/ConnexionViewController.m
	Coffeed/Constantes.h
	Coffeed/CustomUILabel.h
	Coffeed/CustomUILabel.m
	Coffeed/EmptyCell.xib
	Coffeed/FeedCell.xib
	Coffeed/FeedListViewController.h
	Coffeed/FeedListViewController.m
	Coffeed/FeedTableViewController.m
	Coffeed/FeedViewController.m
	Coffeed/FeedlyUtils.h
	Coffeed/FeedlyUtils.m
	Coffeed/HomeViewController.h
	Coffeed/HomeViewController.m
	Coffeed/Images.xcassets/AppIcon-2.appiconset/Icon-114.png
	Coffeed/Images.xcassets/AppIcon-2.appiconset/Icon-120.png
	Coffeed/Images.xcassets/AppIcon-2.appiconset/Icon-29.png
	Coffeed/Images.xcassets/AppIcon-2.appiconset/Icon-57.png
	Coffeed/Images.xcassets/AppIcon-2.appiconset/Icon-58.png
	Coffeed/Images.xcassets/AppIcon-2.appiconset/Icon-80.png
	Coffeed/MenuAccountCell.xib
	Coffeed/MenuItem.m