Moved git repo to wp-content
Merge branch 'development'

Conflicts:
	.gitignore
	index.php