Merge branch 'master'
Merge branch 'origin/master'
Added .gitkeep to Extensions, update report progress
Remove extensions from ignore
Try #2 for gitkeep
Update ignored files
Merge branch 'develop'