Merge pull request #52 from baasbox/master

update from origin master
resolved ambiguos (java8) cast
fixed a json format problem when some very complex function was passed via querystring
Merge pull request #486 from giastfader/master

fixed a json format problem when some very complex function is used in QS