Master, MasterProxy, Server and User code

- Ready to start testing some apps and removing last bugs