Master commit
combine branch reset
...
Merge branch 'Combine_ZeroConfig_and_InitServer'
Merge branch 'master' of https://github.com/gadei/smartOrder