Añadido teletexto
Merge branch 'master' of https://github.com/EverywhereHouseControl/iOS-App

Conflicts:
	ehc/Pods/Pods.xcodeproj/project.pbxproj