Merge pull request #1 from 14jesenskyd/feature-UserPermissions

Fix a broken merge...
Git, please stop breaking.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client/Client.cs
	Client/Forms/Configuration Form.cs
Okay...
Fix "parameterization" of table script. Fixes #8.
Merge remote-tracking branch 'origin/master' into feature-UserPermissions