changed string representation of logical AND token
changed string representation of array entry token
Merge branches 'and_token' and 'array_entry_token' into develop