Changed String API about conversion into standard C/C++ strings
Fixed conflicts