c
Merge branch 'master' of https://github.com/darknos/SomeTestingsSamples

Conflicts:
	tiapp.xml