changes
Merge branch 'master' of github.com:pam-/mappetizer
fixed activity model