Merge branch 'master' of https://github.com/eiffelhub/json

Conflicts:
	draft/library/gobo/shared_gobo_ejson.e
	draft/library/kernel/converters/json_converter.e
	draft/library/kernel/converters/json_hash_table_converter.e
	draft/library/kernel/converters/json_linked_list_converter.e
	draft/library/kernel/ejson.e
	draft/library/kernel/shared_ejson.e
	draft/test/autotest/test_suite/json_author_converter.e
	draft/test/autotest/test_suite/json_book_collection_converter.e
	draft/test/autotest/test_suite/json_book_converter.e
	draft/test/autotest/test_suite/test_json_core.e

contrib/library/text/parser/json/library/kernel/ejson.e

@@ -1,8 +1,8 @@
 note
     description: "Core factory class for creating JSON objects and corresponding Eiffel objects."
     author: "Paul Cohen"
-    date: "$Date: $"
-    revision: "$Revision: $"
+    date: "$Date$"
+    revision: "$Revision$"
     file: "$HeadURL: $"
 
 class EJSON
@@ -69,7 +69,7 @@ feature -- Access
             elseif attached {STRING_8} an_object as s8 then
                 create {JSON_STRING} Result.make_json (s8)
             elseif attached {STRING_32} an_object as s32 then
-                create {JSON_STRING} Result.make_json (s32.as_string_8) -- FIXME: need correct convertion/encoding here ...
+                create {JSON_STRING} Result.make_json_from_string_32 (s32)
             end
 
             if Result = Void then
@@ -253,9 +253,9 @@ feature {NONE} -- Implementation (Exceptions)
             -- Exception message for failing to convert `a' to a JSON_VALUE.
         do
 			Result := exception_prefix + "Failed to convert Eiffel object to a JSON_VALUE"
-        	if an_object /= Void then
-	            Result := ": " + an_object.generator
-        	end
+			if an_object /= Void then
+				Result := ": " + an_object.generator
+			end
         end
 
 feature {NONE} -- Implementation (JSON parser)