update docs version
Merge branch 'master' into django1.5
update docs version