Merge branch 'api' into filmowa

diff --combined edumed/urls.py
index a62aee3,c0186aa..a06a2e9
--- 1/edumed/urls.py
--- 2/edumed/urls.py
+++ b/edumed/urls.py
@@@ -4,7 -4,8 +4,7 @@@ from django.conf import setting
  from django.contrib.flatpages.views import flatpage
  from django.shortcuts import redirect
  
 -from .views import HomeView, AvatarlessProfileEditView
 -
 +from .views import HomeView, AvatarlessProfileEditView, flatpage_with_template
  
  urlpatterns = patterns(
      '',
@@@ -14,9 -15,6 +14,9 @@@
      url(r'^info/(?P<url>.*)$', flatpage, name="info"),
      url(r'^olimpiada/$', lambda request: flatpage(request, 'turniej/'), name='olimpiada'),
      url(r'^olimpiada/(?P<url>.*)$', lambda request, url: flatpage(request, 'turniej/' + url), name='olimpiada'),
 +    url(r'^olimpiada-teaser/(?P<url>.*)$',
 +        lambda request, url: flatpage_with_template(request, 'turniej/' + url, 'olimpiada_teaser.html'),
 +        name='olimpiada_teaser'),
      url(r'^szukaj/', include('haystack.urls')),
      url(r'^zglos/', include('contact.urls')),
      url(r'^forum/profile/edit/$', AvatarlessProfileEditView.as_view(), name='edit_profile'),
@@@ -24,6 -22,7 +24,7 @@@
      url(r'^forum/', include('pybb.urls', namespace='pybb')),
      url(r'^kompetencje/', include('curriculum.urls')),
      url(r'^wtem/', include('wtem.urls')),
+     url(r'^api/', include('api.urls')),
  )