Added Gson library  + Formatted error message to json
Merge remote-tracking branch 'origin/master'