updated flow
Merge branch 'master' into phil

Conflicts:
	tiapp.xml