ŐVÅ
Merge branch 'master' of https://github.com/coe/tishadowapp

Conflicts:
	tiapp.xml