Adding Ubik Admin
Merge branch 'master' into synapticism

* master:
  Adding Ubik Admin