Merge branch 'release/2.1.14' into develop
Migrate to Django 1.5
Update tox
Update travis
Update version
Merge branch 'release/2.2.0'