Added gitignore
Added README
Merge branch 'hotfix'
Merge branch 'master' into activities-3.0