fixed problem with union field in admin module
Merge branch 'feature/79-add-union-field' into staging

* feature/79-add-union-field:
  fixed problem with union field in admin module