Ubik Series update
Merge branch 'master' into synapticism

* master:
  Ubik Series update

Conflicts:
	dist/pendrell/style.css