add w_line
Update admin.py
Update hooks.py
Update search_indexes.py
Update tests.py
Update urls.py
Update views.py
Merge branch 'master' into kingman