Added Apache HTTP components, json and unirest library for easy http REST calls
fixed merge conflicts