catching up on a demo
Merge branch 'master' of https://github.com/tr8n/tr8n_objc_clientsdk

Conflicts:
	Project/Demo.xcodeproj/project.pbxproj
Merge branch 'master' into ui

Conflicts:
	Project/Demo.xcodeproj/project.pbxproj
	Project/Demo/MenuViewController.m