Merge "Implemented client-server model and changed code for thread safety" into tizen_2.1