v3.0
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	common-functions.php
	readme.txt