Interface: 2 activities + Methods
Merge branch 'master' into cristi
server fix + client interface
Merge branch 'cristi'