Try to expose the filler flag in the JSON output.
Merge pull request #26 from petterreinholdtsen/jsonfiller

Try to expose the filler flag in the JSON output.
Fixed URL to frikanalen.no in README.
Merge pull request #27 from terjr/master

Fixed URL to frikanalen.no in README.
Remove some CSS to make the design nicer
Merge pull request #28 from Frikanalen/odinho/remove_css

Remove some CSS to make the design nicer
settings: Remove ADMIN_MEDIA_PREFIX, it's deperecated in 1.4, use staticfiles
Upgrade to Django 1.5, and revise the project layout
Send the SECRET_KEY env var from WSGI env to the app
Add config variable to add EXTRA_SITE_DIR to use virtualenvs on server
Some wsgi and setting changes for production
Make paged navigation look somewhat sane again
Fix faulty settings import to use the correct method
planner: Ouch, Django REST Framework changed its API, results in 'results' now.
rest_framework: video should be optional (should it really be there at all?)

Plus whitespace fixes in related files.
Update the frontpage text

And clean up urls file while we're at it
frontpage: Take away some 'check this' text
Update branch to current master version.