From server
Client is better
Merge branch 'master' of https://github.com/upkanet/onechoice