Merge branch 'master' of github.com:dellsystem/wikinotes
Use get_object_or_404 for news view