requirements version
Django 1.6.5
Functools .wraps()
Merge branch 'master' into v2.0

Conflicts:
	requirements.txt