django 1.7 migrations
Merge remote-tracking branch 'origin/master'