Setup dev environment

Merge developement server changes into master