Merge pull request #1 from unikent/master

[DeployBot] STABLE Pull
Merge pull request #2 from unikent/master

[DeployBot] STABLE Pull
Rename the tables, so they look nicer
Merge pull request #3 from unikent/STABLE

Stable