changed array entry token shortcut to be a static method
Merge branch 'array_entry_token' into develop