Merge branch 'master' into davis-dev
Added directory for server development

This is also to test the pull request for the different branches.
Merge pull request #4 from davisengeler/davis-dev

Updated beta from davis-dev
Merge pull request #5 from davisengeler/beta

Update master from beta.