Update url for folder paths
Merge origin/master

Conflicts:
	functions.php