added map function
Merge branch 'master' of ssh://sbt.science.uva.nl/home/ninghang/git/activity_recognition