Merge branch 'dev' into 'master'

Dev

See merge request !48

lms/urls.py

@@ -1,6 +1,7 @@
 from django.conf.urls import url, include
 from django.contrib import admin
 from django.views.static import serve
+from yandex_money.views import CheckOrderFormView, NoticeFormView
 
 from lms import settings
 
@@ -9,5 +10,6 @@ urlpatterns = [
     url(r'^admin/', include(admin.site.urls)),
     url(r'^media/(?P<path>.*)/$', serve, {'document_root': settings.MEDIA_ROOT}),
     url(r'^static/(?P<path>.*)/$', serve, {'document_root': settings.STATIC_ROOT}),
-    url(r'^yandex-money/', include('yandex_money.urls')),
+    url(r'^wallet/pay/check/$', CheckOrderFormView.as_view(), name='yandex_money_check'),
+    url(r'^wallet/pay/result/$', NoticeFormView.as_view(), name='yandex_money_notice'),
 ]