Merge pull request #1 from nimbis/master

Added Django 1.7 migrations