fixing serious issue in git tool: make fetch before push work again
Merge branch 'master' of ssh://github/spookey/photon

* 'master' of ssh://github/spookey/photon:
  fixing serious issue in git tool: make fetch before push work again

Conflicts:
	photon/tools/git.py
it could have worked -.-