Fixed README
Merge branch 'README'
Merge branch 'master' into activities-3.0