Adding state activity handling.
Merge branch 'master' of https://github.com/NinjaTrappeur/pau-ware-view