Added GROUP_TYPE token and fixed PHONE_NUMBER token
Added BREED_CLASSIFIER to timeblock_comment
Updated grammar passes on tests. Next step is to migrate it to jUnit