1

1
Merge branch 'master' of https://github.com/tlsion/CloudApp

Conflicts:
	CDController/CALoginViewController.m
	CloudApp/CloudApp-Info.plist