4671
Merge branch 'master' of https://github.com/Bookt/WP-InstaSites

Conflicts:
	functions.php