Merging development with master.
Merge branch 'development'

Conflicts:
	README.md
	base.php
	functions.php
	lib/config.php
	lib/customizer.php
	style.css
Merge branch 'master' into development