Added canvas login and site admin login options
Merge remote-tracking branch 'instructure/CanvasKit/master'

Conflicts:
	CanvasKit/UIKit+CanvasKit/CKILoginViewController.m
Builds with iOS 7 SDK
Merge pull request #128 from derrh/master

Added canvas login and site admin login options