backward compatibility with django version older than 1.6
fixed migrations for custom user model
Merge remote-tracking branch 'sasha/master' into unleash