merged with bts_xt_gui branch
fixed conflict in rpc_server.cpp
Merge pull request #74 from valzav/master

bts_xt_gui attempt #2