made settings.py import settings from a local_settings.py if it exists
CHALLENGE: small adjustments
Merge branch 'master' of github.com:martflu/amanaman
Merge branch 'master' of github.com:martflu/amanaman

* 'master' of github.com:martflu/amanaman:
  CHALLENGE: small adjustments
  increase polling_interval on ajax error
  cleanup
  bit of cleanup
  stack only blocked with nothing review
  introduced multi_comment for multiple comments per page. should work dynamically but slow.
SLIDES: missing images for lecture bookmarks
refactoring comments in evaluation;
Merge branch 'master' of https://github.com/martflu/amanaman into comments
FEED: improvised newsfeed page for test. please do NOT read the content.
NEW: hello world comments!
added more users and tutors for testing session
Merge branch 'master' of https://github.com/martflu/amanaman
COMMENTS: finally fixed the buttons on the reply-form
fixed profile
Merge branch 'master' of https://github.com/martflu/amanaman
COMMENTS: push comment as notification icon
COMMENTS: minor css buxfixes
BOOKMARKS page introduced
FEED ordentliche texte auf der provisorischen startseite für den test
SLIDES make audio player look inactive
LOGIN small layout adjustment. not very successful, but better.