Bug fixed where the id would not be saved correctly, strtok modifies the string it is parsing.
Merge branch 'fix_rest_id_handling' into develop