JSON to Objects
Merge remote-tracking branch 'artsy/master' into expanded_models

Conflicts:
	Kiosk/App/Models/SystemTime.swift
	KioskTests/Models/SystemTimeTests.swift