[ci skip]
Merge branch 'master' of github.com:UsabilityDynamics/wp-splash

Conflicts:
	lib/class-splash.php