Merge branch 'release/1.0.1'

* release/1.0.1:
  Release version 1.0.1
  Get config auto-reloading to work in a WAR file
Merge branch 'release/1.1.0'

* release/1.1.0:
  Update version number
  Documentation updates
  Add more config options to C# client
  Add more config options to PHP client
  Add more configuration options to Java Client
  Moved clients to new location
  Fix Reload plugin config
PHP encryption library had the wrong blocksize
Merge branch 'hotfix/1.1.1' into develop

* hotfix/1.1.1:
  PHP encryption library had the wrong blocksize