added catchUp call to BCSAPI
1.2.5
catch null pointer at timeout
re-merging wallet code