Merge remote-tracking branch 'atiberghien/master'

Fixed the change_list.html template to use the django 1.5 url tag correctly.