updated mapreduce files
Merge branch 'master' of https://github.com/awiss/netsfb
merge conflict