Server modifications
Merge branch 'master' of github.com:rreusser/beans