Merge pull request #135 from Caldair/master

Another fix for tabletUI on CM Nightlies. No changes to the patched files for 2 days, maybe it will last this time...
versioning

sorry caldair, I had intended to do this last night.