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

Conflicts:
	website/autocomplete_app/autocomplete_light_registry.py
	website/cinema/models.py
	website/cinema/urls.py
	website/cinema/views.py
	website/templates/actor.html
	website/templates/cinema/home.html
	website/templates/cinema/prediction.html
	website/website/urls.py
Merge branch 'master' of https://github.com/bdrighes/webmining2013