fixed phpDoc format for logical AND shortcut
Merge branch 'and_token' into develop