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
Fixing missing translation
Translation files
Merge branch 'master' of github.com:Nuevosmedios/askbot-devel
Merge remote-tracking branch 'upstream/master'

Conflicts:
	askbot/locale/ru/LC_MESSAGES/django.po
	askbot/media/js/live_search.js
Merge branch 'master' of github.com:ASKBOT/askbot-devel
Translations for es
More translations
Translations