Initial commit
Fixing merge conflict with feature-wordpress3.9
Removing .orig files