Merge branch 'master' of https://github.com/thermogl/TITokenField into barz-fixing

Conflicts:
	TITokenField.m
Merge branch 'barz-fixing' into barz-master

Conflicts:
	TITokenField.m