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
Merge branch 'master' into engine

Conflicts:
	app/com/baasbox/Global.java