Fix for image positioning
Merge branch 'develop' with multilingual setup
Adjustments to .gitignore
Merge branch 'develop'
Merge branch 'develop'
Adding more items from the WordPress 3.5 upgrade.
Merge branch 'master' into develop