Resolution Change

iPhone 5 Optimization
Merge branch 'master' of https://github.com/Zcial/CanalTR3CE

Conflicts:
	config.xml