more server work
Merge branch 'master' of github.com:wangjohn/order_preserving_encryption