Add local token

First time, click login to jump to editor page, then app will read
token and jump to editor page directly
Merge branch 'master' of https://github.com/counterphiler/TripBuddy

Conflicts:
	RichTextEditing/Base.lproj/Main.storyboard
	TripBuddy.xcodeproj/project.pbxproj
re