Eliminate strict standards notice
Merge branch 'master' of github.com:x-team/wp-settings-revisions

Conflicts:
	php/post-type.php