Modified TTSlaveLineController
Merge branch 'master' of https://github.com/LoneHouse/TactTime

Conflicts:
	Takt Times/Classes/Controllers/TT Choice Controller/TTChoiceController.m
	Takt Times/Classes/TTConstants/TTConstants.m
Merge branch 'master' of https://github.com/LoneHouse/TactTime