add acts_as extension, bug fix
Merge branch 'master' into am