Removed class based views from pull request, kept the bug fixes.
Fix small bug in demo app