add cardflight
Merge pull request #27 from orta/cards

@ashfurrow => add cardflight
Storyboard Identifiers
Merge pull request #28 from orta/cards

@ashfurrow => Storyboard Identifiers in Swift
Rebased from artsy/master.
Updated Moya.
Basics of transparent XApp token-retrieval.
update to cocoapods 0.34 pre
Merge pull request #30 from artsy/pre

@ashfurrow => update to cocoapods 0.34 pre
Merge remote-tracking branch 'artsy/master' into auctions-api

Conflicts:
	Podfile.lock
Add some more pages to the storyboard, add snapshot tests covering new view controllers
Merge pull request #31 from orta/storyboarding

@ashfurrow => Add some more pages to the storyboard
Changed semantics of stubResponses property.
Reverted crazy xcodeproj change.
Merge remote-tracking branch 'artsy/master' into auctions-api

Conflicts:
	Kiosk.xcodeproj/project.pbxproj
Standardize usage of Keys
Merge pull request #32 from orta/keys

@ashfurrow => Standardise usage of Keys
Merge remote-tracking branch 'artsy/master' into auctions-api
Made NSDate extension private.
Fixed singleton.