Merge branch 'release/0.1.5' into develop
fix messages
fix django 1.5 capable
refactoring
bump version number
Merge branch 'release/0.1.6'