cleaning up switch to devel branch of tgs-core, adding square UI to java side