remove uploads from root .gitignore
Add ContentBlockModule to recomended for installation
Merge pull request #1451 from Technopoint/master

Add uploads to repo and ContentBlockModule to default install