Finishing active state integration.
Merge branch 'master' of https://github.com/NinjaTrappeur/pau-ware-view