Re-added uploades directory in order to avoid inconsistencies between media db and uploads dir.
Merge branch 'master' of https://github.com/gorgogol/gorgogol-website
Merge branch 'master' of https://github.com/gorgogol/gorgogol-website
Added admin and includes wordpress folder in .gitignore.
Added admin and includes wordpress folder in .gitignore.
Merge branch 'master' of https://github.com/gorgogol/gorgogol-website

Conflicts:
	.gitignore
New image files.
Ignore folders: admin, includes, and uploads.