fix migrations for django1.7
change branch to develop