Integrating mvexel's oauth code
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Integrating mvexel's oauth code

Conflicts:
	front.py