moviesearch
Merge branch 'master' of https://github.com/bdrighes/webmining2013

Conflicts:
	website/cinema/views.py
Merge branch 'master' of https://github.com/bdrighes/webmining2013