Merge branch 'master' of https://github.com/matbury/SWF-Activity-Module2.5.git