update for iOS 7
Merge commit 'de073c5'

Conflicts:
	TITokenField.m