Merge pull request #128 from derrh/master

Added canvas login and site admin login options
Merge pull request #129 from derrh/master

CanvasKit v0.52
added swift unit testing. Finished unit test for CKIUser
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Podfile.lock
Merge pull request #130 from elgreco84/master

Swift unit testing and updated to framework
added tests for CKIFile, CKIService, CKIQuiz and CKIGroup
Merge remote-tracking branch 'upstream/master'
Merge pull request #131 from elgreco84/master

Added more tests
added swift tests for following models:

CKIExternalTool
CKIDiscussionTopic
CKIActivityStreamMessageItem
CKIActivityStreamItem
CKIActivityStreamDiscussionTopicItem
CKIActivitySTreamConversationItem
removed OSX requirements in Podspec
Merge pull request #132 from nlambson/master

added swift tests for following models:
Merge remote-tracking branch 'upstream/master'
Merge pull request #133 from elgreco84/master

Removed OSX support in podspec
release 0.53
Merge remote-tracking branch 'upstream/master'
updated the tag in the podspec
Fixes a media comment id parsing issue