unmodified satellizer, #22e43f3467ebbf82f68737165b276e35fa4696b6
Added support for Opauth.
Messy proof of concept.
Merge remote-tracking branch 'origin/master' into satelizer

* origin/master:
  Messy proof of concept.
  Added support for Opauth.
  unmodified satellizer, #22e43f3467ebbf82f68737165b276e35fa4696b6

Conflicts:
	src/Template/Layout/default.ctp