Change activation done
Merge branch 'master' of https://github.com/tsmakalagy/godana-14032014