http://mantis.bookt.com/view.php?id=4197
Merge branch 'master' of https://github.com/Bookt/WP-InstaSites

Conflicts:
	bapi/bapi.ui.js