Merge branch 'release/3.1.0' into develop
Fix tests. Integrate Django 1.6
Update version
Merge branch 'release/3.2.0'