Large refactor putting controllers together to simplify
Merge branch 'master' into messages

Conflicts:
	jeju.xcworkspace/xcuserdata/berget.xcuserdatad/UserInterfaceState.xcuserstate
	jeju/Base.lproj/Main.storyboard
	jeju/Controllers/ConversationTableViewController.m
	jeju/Models/OctokitModel.h