fixes
Merge branch 'master' of https://github.com/NAlexandrov/deputy

Conflicts:
	assets/js/revenge.js