Dont use some old hard coded token, please
Merge pull request #285 from gannetson/who-has-taken-my-token

Dont use some old hard coded token, please
Merge remote-tracking branch 'upstream/master'

Conflicts:
	templates/base.html