changed activity._typeid to activity.getType.equals
Merge branch 'master' of https://github.com/anneback/iprog-project