...
Merge branch 'master' of https://github.com/kamir/TSCache

# By Mirko Kaempf
# Via Mirko Kaempf
* 'master' of https://github.com/kamir/TSCache:
  ..:
  pre release ....
  pre release ...

Conflicts:
	dist/TSCache.war
	src/java/tools/SimpleTSTool.java