Minor bug fixes and new Civet.zip build
Merge branch 'master' of https://github.com/mkm1879/Civet
Minor bug fixes and rebuild Civet.jar and Civet.zip