Commit v2.2

Portals ok
Gate&Trigger ok