test locale update
update url locale
update url locale
update url locale
update url locale
update url locale
update url locale
update url locale
update url locale
update url locale
update url locale
update url locale
Merge remote-tracking branch 'upstream/master'

Conflicts:
	askbot/locale/ru/LC_MESSAGES/django.po
	askbot/media/js/live_search.js
locale update
Merge remote-tracking branch 'origin/master'

Conflicts:
	askbot/locale/ru/LC_MESSAGES/django.mo
	askbot/locale/ru/LC_MESSAGES/djangojs.mo
	askbot/locale/ru/LC_MESSAGES/djangojs.po
	askbot/media/js/live_search.js
locale update
started working on ediors with hiedable buttons
fixed a bug in jive import
recompiled style.css
fixed a bug in jive import