General improvement
Merge branch 'master' of github.com:ZuluPro/ZuluBot

Conflicts:
	core/templates/action/remove-category.html
	core/templates/search-span.html
	core/views/actions.py
	core/views/editor.py
	static/js/my.js
	zulubot/settings_local.py
	zulubot/settings_validation.py
Merge branch 'master' of github.com:ZuluPro/ZuluBot

Conflicts:
	core/locale/fr/LC_MESSAGES/django.mo
	core/locale/fr/LC_MESSAGES/django.po
Translate all HTML