Make up
Merge branch 'master' of https://github.com/G-Nat/django-rating

Conflicts:
	rating/ajax.py