tira update
Merge branch 'master' of https://github.com/annabeyer/tira-8

Conflicts:
	bin/tira/TiraServer$TiraIgnoreFileFilter.class