Updates
Updates
Fixed merge conflict
Merge branch 'multisite'
More changes
Updated version file