fixed logo
fixes #1762
fixes #1878
fixes different l10n #1777

Conflicts:
	conf/locale/ru/LC_MESSAGES/djangojs.po
	conf/locale/ru/LC_MESSAGES/mako.po
Fix a type
Fix #1932

Conflicts:
	lms/templates/emails/order_confirmation_email.txt
work on #2015

Conflicts:
	common/lib/xmodule/xmodule/graders.py
fix compile bug