added dummy server
Merge master into server