reduce shift/reduce errors by 2, introduced a new state bundel_decl
Merge pull request #527 from basvandervlies/fix_shift_reduce

reduce shift/reduce errors by 2, introduced a new state bundel_decl