views.py database
Merge branch 'master' of github-nlp:nlp-hda/nlp2012