Merge pull request #327 from stianst/master

Add timer jars to server