Merge branch 'release/v0.2.0' into develop
fix django to 1.6.5
bump version to 2.1
Merge branch 'release/v0.2.1'