Bump requirements, use Django 1.5
Merge branch 'master' into django-fluent

Conflicts:
	requirements.txt
Bump versions of django-fluent modules too.